Author: tchemit Date: 2009-01-21 02:13:01 +0000 (Wed, 21 Jan 2009) New Revision: 1541 Added: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/JSynchronizeTab.jaxx branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/LoginUI.jaxx branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/common.css branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/util/ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/icons/ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/site/en/ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/site/en/rst/ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/site/en/rst/user/ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/site/en/rst/user/SimExplorerUsage.rst branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/site/fr/ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/site/fr/rst/ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/site/fr/rst/user/ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/site/fr/rst/user/SimExplorerUsage.rst branches/migration-200901/simexplorer-is/src/site/fr/rst/devel/migration2009.rst Removed: branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/resources/commandline.properties branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/resources/icons/ branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JSynchronizeTab.jaxx branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/LoginUI.jaxx branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/common.css branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/util/ Modified: branches/migration-200901/simexplorer-is/pom.xml branches/migration-200901/simexplorer-is/simexplorer-is-swing/pom.xml branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/log4j.properties Log: suppression du module de generation swing Modified: branches/migration-200901/simexplorer-is/pom.xml =================================================================== --- branches/migration-200901/simexplorer-is/pom.xml 2009-01-21 01:20:45 UTC (rev 1540) +++ branches/migration-200901/simexplorer-is/pom.xml 2009-01-21 02:13:01 UTC (rev 1541) @@ -23,7 +23,7 @@ <module>simexplorer-is-security</module> <module>simexplorer-is-storage</module> <module>simexplorer-is-service</module> - <module>simexplorer-is-swing-generated</module> + <!--module>simexplorer-is-swing-generated</module--> <module>simexplorer-is-swing</module> <module>simexplorer-is-web</module> <module>simexplorer-is-ear</module> Modified: branches/migration-200901/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/pom.xml 2009-01-21 01:20:45 UTC (rev 1540) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/pom.xml 2009-01-21 02:13:01 UTC (rev 1541) @@ -24,11 +24,32 @@ <artifactId>simexplorer-is-service</artifactId> <version>${project.version}</version> </dependency> - <dependency> + + <!--dependency> <groupId>${project.groupId}</groupId> <artifactId>simexplorer-is-swing-generated</artifactId> <version>${project.version}</version> + </dependency--> + + <!-- librairie des widgets lutin --> + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinwidget</artifactId> </dependency> + <!-- librairie Jaxx --> + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-swing</artifactId> + </dependency> + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>util</artifactId> + </dependency> + <!-- librairie commandline --> + <dependency> + <groupId>org.codelutin.commandline</groupId> + <artifactId>commandline-core</artifactId> + </dependency> <!-- librairie commandline-ui --> <dependency> @@ -73,10 +94,127 @@ <!--Main class in JAR --> <maven.jar.main.class>fr.cemagref.simexplorer.is.ui.swing.SimExplorer</maven.jar.main.class> + <maven.java.src.dir>${maven.src.dir}/java</maven.java.src.dir> + <maven.classes.dir>${basedir}/target/classes</maven.classes.dir> + <maven.gen.dir>${basedir}/target/generated-sources</maven.gen.dir> + </properties> <build> <plugins> + + <plugin> + <groupId>org.codelutin.commandline</groupId> + <artifactId>maven-commandline-plugin</artifactId> + <version>${commandline.version}</version> + <configuration> + <prefix>SimExplorer</prefix> + <packageName>fr.cemagref.simexplorer.is.ui.swing.commandline</packageName> + </configuration> + <executions> + <execution> + <!-- do not use generate phase, since it will be reexecuted a second time... --> + <phase>process-resources</phase> + <id>genJava</id> + <goals> + <goal>genJava</goal> + </goals> + <configuration> + <source>${maven.src.dir}/resources/commandline.properties</source> + <out>${maven.gen.dir}/java</out> + <concreteConfig>true</concreteConfig> + <concreteContextFQN>fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext + </concreteContextFQN> + <_projectName>SimExplorer-SI</_projectName> + <_configFileName>.simexplorer-si-1</_configFileName> + <_version>${project.version}</_version> + <_projectURL>http://simexplorer-si.labs.libre-entreprise.org</_projectURL> + <_organisationName>Cemagref</_organisationName> + <_organisationURL>http://www.cemagref.fr</_organisationURL> + <_copyright>Copyright Cemagref 2008</_copyright> + </configuration> + </execution> + <execution> + <id>genRst</id> + <goals> + <goal>genRst</goal> + </goals> + <configuration> + <rstFilePath>${maven.src.dir}/site/@bundle@/rst/user</rstFilePath> + <out>${basedir}/target/classes</out> + <i18nCP>${maven.src.dir}/resources</i18nCP> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + <configuration> + <copyToCP>true</copyToCP> + <actionsFile>/jaxx/simexplorer-actions.properties</actionsFile> + <baseResource>${basedir}/src/resources</baseResource> + <src>${basedir}/src/java</src> + </configuration> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>jaxx-generate-actions-provider</id> + <goals> + <goal>generate-actions-provider</goal> + </goals> + <configuration> + <fqn>fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionProvider</fqn> + <fqnAction>fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction + </fqnAction> + <providerName>simexplorer</providerName> + </configuration> + </execution> + <execution> + <id>jaxx-generate-actions</id> + <goals> + <goal>generate-actions-properties</goal> + </goals> + <configuration> + <includes> + <param> + fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*Action.java + </param> + </includes> + <excludes> + <param> + fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*AbstractAction.java + </param> + </excludes> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinwidget</artifactId> + <version>0.10-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinutil</artifactId> + <version>0.29.1</version> + </dependency> + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-swing</artifactId> + <scope>compile</scope> + <version>${jaxx.version}</version> + </dependency> + </dependencies> + </plugin> + <!-- Compile phase --> <plugin> <groupId>lutinplugin</groupId> @@ -143,53 +281,17 @@ <goal>parserJava</goal> <goal>gen</goal> </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> - <configuration> - <copyToCP>true</copyToCP> - <actionsFile>/jaxx/simexplorer-actions.properties</actionsFile> - <baseResource>${basedir}/src/resources</baseResource> - <src>${basedir}/src/java</src> - </configuration> - <executions> - <execution> - <id>jaxx-generate-actions-provider</id> - <goals> - <goal>generate-actions-provider</goal> - </goals> <configuration> - <fqn>fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionProvider</fqn> - <fqnAction>fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction - </fqnAction> - <providerName>simexplorer</providerName> + <entries> + <entry> + <basedir>${maven.gen.dir}/java</basedir> + </entry> + </entries> </configuration> </execution> - <execution> - <id>jaxx-generate-actions</id> - <goals> - <goal>generate-actions-properties</goal> - </goals> - <configuration> - <includes> - <param> - fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*Action.java - </param> - </includes> - <excludes> - <param> - fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*AbstractAction.java - </param> - </excludes> - </configuration> - </execution> </executions> </plugin> + <!-- Package phase --> <plugin> <groupId>org.apache.maven.plugins</groupId> Copied: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx (from rev 1538, branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx) =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx (rev 0) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx 2009-01-21 02:13:01 UTC (rev 1541) @@ -0,0 +1,82 @@ +<JDialog> + <script> +AbstractAction cancelAction = new AbstractAction(_("simexplorer.common.cancel")){ + private static final long serialVersionUID = -4585698788717305452L; + + public void actionPerformed(ActionEvent e) { + filePath.setText(null); + dispose(); + } +}; + +public java.io.File getFile() { + setVisible(true); + if (filePath.getText().equals("")) { + return null; + } + java.io.File f= new java.io.File(filePath.getText()); + filePath.setText(null); + return f; +} + +private java.util.Map<String, String[]> filters; + +protected void chooseDir() { + String type = (String) getTypeImport().getSelectedValue(); + String[] filter = this.filters.get(type); + File dir= org.codelutin.util.FileUtil.getFile(filter==null?null:filter); + if (dir!=null) { + filePath.setText(dir.toString()); + } +} +protected void check() { + String t = filePath.getText(); + java.io.File f = new File(t); + ok.setEnabled(!t.equals("") && f.exists() && f.isFile()); +} + +public ImportDialog(JFrame frame,java.util.Map<String,String[]> filters) { + super(frame,true); + JRootPane rootPane = getRootPane(); + rootPane.setDefaultButton(ok); + rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"),"cancel"); + rootPane.getActionMap().put("cancel", cancelAction); + this.filters = filters; +} + </script> + <Table> + <row fill='vertical'> + <cell anchor='west' fill='horizontal' weightx="2"> + <JLabel text='simexplorer.choose.import.label'/> + </cell> + <cell anchor='west'> + <VBox> + <JRadioButton id='selected' text='simexplorer.entities.applicationExploration' value='ApplicationExploration' buttonGroup='typeImport' onActionPerformed='filePath.setText(null)'/> + <JRadioButton text='simexplorer.entities.library' value='Library' buttonGroup='typeImport' onActionPerformed='filePath.setText(null)'/> + </VBox> + </cell> + </row> + <row> + <cell columns='2' weightx='1' fill='horizontal'> + <Table> + <row fill="both"> + <cell weightx='1' fill='both' insets='0,0,0,0'> + <JTextField id='filePath' onCaretUpdate='check()' margin='0,0,0,0'/> + </cell> + <cell anchor='east' insets='0,2,0,0'> + <JButton id='chooseDirectory' icon='{createImageIcon("fileChooser.png")}' onActionPerformed='chooseDir()' margin='0,0,0,0'/> + </cell> + </row> + </Table> + </cell> + </row> + <row fill='horizontal'> + <cell columns='2'> + <JPanel layout='{new GridLayout(1, 0, 2, 2)}'> + <JButton id='ok' text='simexplorer.action.importElement' enabled='false' onActionPerformed='dispose();'/> + <JButton id='cancel' text='simexplorer.common.cancel' action='{cancelAction}'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Copied: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx (from rev 1538, branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx) =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx (rev 0) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx 2009-01-21 02:13:01 UTC (rev 1541) @@ -0,0 +1,141 @@ +<JAXXTab> + <style source="common.css"/> + <row> + <cell> + <!--TODO imposer une taille minimum --> + <Table id='toolbarNavigation' styleClass='border' insets='0,0,0,0'> + <row> + <cell anchor='west' insets='0,2,0,0' weightx="1" fill='horizontal' > + <JLabel id='detailHeaderFromLocal' opaque='false' visible='false' + text='simexplorer.node.navigation.local' + icon='{createImageIcon("action/local.png")}'/> + </cell> + <cell anchor='west' insets='0,2,0,0' weightx="1" fill='horizontal' > + <JLabel id='detailHeaderFromRemote' opaque='false' + text='simexplorer.node.navigation.remote' + visible='false' icon='{createImageIcon("action/remote.png")}'/> + </cell> + <cell anchor="east" insets='0,0,0,0'> + <JToolBar> + <JButton id='historyPrevious'/> + <JButton id='historyNext'/> + <JButton id='collapseAllDetail'/> + <JButton id='expandAllDetail'/> + </JToolBar> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell> + <Table id='toolbarDetail' styleClass='border' background='{Color.WHITE}' insets='0,0,0,0'> + <row> + <cell anchor='west' fill="vertical"> + <JToolBar> + <JButton id='detailToTree'/> + </JToolBar> + </cell> + <cell weightx="1" fill='horizontal'> + <JPanel opaque='false' > + <JLabel id='detailHeader' opaque='false' /> + </JPanel> + </cell> + <cell anchor="east"> + <JToolBar> + <JComboBox id='detailVersions' model='{new DefaultComboBoxModel()}'/> + <JButton id='showTab_synchronize'/> + <JButton id='exportElement'/> + <JButton id='downloadElement'/> + <JButton id='deleteElement'/> + </JToolBar> + </cell> + </row> + </Table> + </cell> + </row> + <row fill="both" weightx="1" weighty="1"> + <cell columns="2"> + <JSplitPane id='splitOne' orientation="horizontal" resizeWeight="0.45" oneTouchExpandable='true'> + <JScrollPane columnHeaderView='{toolbarNavigation}'> + <JTree id="navigationTree" model='{new javax.swing.tree.DefaultTreeModel(null)}' styleClass='smallSize'/> + </JScrollPane> + <JScrollPane id="scrollPane" columnHeaderView='{toolbarDetail}' border='{null}' horizontalScrollBarPolicy='horizontal_scrollbar_never' verticalScrollBarPolicy='vertical_scrollbar_never'> + <Table id='detail' insets='2,2,2,1'> + <row fill='vertical'> + <cell anchor='west'> + <JLabel text='simexplorer.common.type'/> + </cell> + <cell weightx="1" anchor='west'> + <JLabel id='detailType'/> + </cell> + </row> + <row fill='vertical'> + <cell anchor='west'> + <JLabel text='simexplorer.common.description'/> + </cell> + <cell fill='horizontal' weightx="2" anchor='west'> + <JLabel id='detailDescription'/> + </cell> + </row> + <row fill='vertical'> + <cell anchor='west'> + <JLabel text='simexplorer.common.creationDate'/> + </cell> + <cell anchor='west'> + <JLabel id='detailCreationDate'/> + </cell> + </row> + <row> + <cell fill='horizontal' columns="2" insets='3,0,0,1'> + <JPanel styleClass='border'> + <JLabel id='detailDescriptorsHeader'/> + </JPanel> + </cell> + </row> + <row> + <cell fill='horizontal' columns="2" insets='0,0,0,0'> + <JScrollPane id='scrollTable' border='{null}' horizontalScrollBarPolicy='horizontal_scrollbar_as_needed' verticalScrollBarPolicy='vertical_scrollbar_as_needed'> + <JTable id="detailTable" border='{null}' focusable='false' enabled='false' /> + <!--JTable id="detailTable" border='{null}' model='{new fr.cemagref.simexplorer.is.ui.swing.model.DetailTableModel()}' focusable='false' enabled='false' /--> + </JScrollPane> + </cell> + </row> + <row> + <cell fill="horizontal" columns="2" insets='3,0,0,1' > + <Table id='toolbarAttachment' styleClass='border' insets='0,0,0,0'> + <row fill='both'> + <cell weightx="1" fill='horizontal'> + <JPanel opaque='false'> + <JLabel id='detailAttachmentsHeader'/> + </JPanel> + </cell> + <cell fill='horizontal' anchor="east"> + <JToolBar> + <JButton id='downloadAttachment'/> + </JToolBar> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill='horizontal' columns="2" insets='0,0,0,0'> + <JScrollPane id='scrollAttachments' horizontalScrollBarPolicy='horizontal_scrollbar_as_needed' verticalScrollBarPolicy='vertical_scrollbar_as_needed'> + <JList id="detailAttachments" model='{new DefaultListModel()}' selectionMode='0'/> + </JScrollPane> + </cell> + </row> + <row weighty="1" weightx="2"> + <cell fill='both'> + <JPanel> + <JLabel text=''/> + </JPanel> + </cell> + </row> + </Table> + </JScrollPane> + </JSplitPane> + </cell> + </row> +</JAXXTab> Copied: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx (from rev 1538, branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx) =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx (rev 0) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx 2009-01-21 02:13:01 UTC (rev 1541) @@ -0,0 +1,57 @@ +<JAXXTab> + <style source="common.css"/> + <script> +public void initPopup(){ + showTab_detail.setHideActionText(false); + showTab_synchronize.setHideActionText(false); + exportElement.setHideActionText(false); + downloadElement.setHideActionText(false); + deleteElement.setHideActionText(false); + importElement.setEnabled(true); + importElement.getAction().setEnabled(true); +} + </script> + <!-- la barre des actions de la liste --> + <row> + <cell fill='horizontal' insets='0,0,0,0'> + <JPopupMenu id="tablePopupMenu" invoker='{table}' enabled='false'> + <JMenuItem id='showTab_detail' hideActionText='false'/> + <JMenuItem id='showTab_synchronize'/> + <JMenuItem id='exportElement'/> + <JMenuItem id='downloadElement'/> + <JMenuItem id='deleteElement'/> + </JPopupMenu> + <JToolBar> + <JButton id='importElement'/> + <JButton id='resetSearch'/> + <JTextField id='searchText' toolTipText='simexplorer.action.searchText.tooltip'/> + <JButton id='search'/> + <JButton id='advancedSearch'/> + <org.codelutin.util.EnumEditor id='changeSizor' font-size='9' constructorParams="org.codelutin.util.SimplePaginationEnum.class" enabled='false' opaque='false' preferredSize='{new Dimension(50,5)}'/> + </JToolBar> + </cell> + </row> + <row fill='both' weightx='1' weighty='1'> + <cell insets='0,0,0,0'> + <JScrollPane> + <JTable id='table' selectionMode='{ListSelectionModel.SINGLE_SELECTION}'/> + <!--JTable id='table' model='{new fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel()}' selectionMode='{ListSelectionModel.SINGLE_SELECTION}'/--> + </JScrollPane> + </cell> + </row> + <!-- la barre de pagination de la liste --> + <row> + <cell anchor='center' insets='0,0,0,0'> + <JToolBar> + <JButton id='goFirstPage' enabled='{false}'/> + <JButton id='goPreviousPage' enabled='{false}'/> + <JPanel layout='{new GridLayout(0, 2, 0, 0)}'> + <JLabel id='currentPage' text='simexplorer.action.currentPage' labelFor="{goPage}" font-size='9'/> + <JComboBox id='goPage' enabled='false' font-size='9' opaque='false' preferredSize='{new Dimension(50,5)}'/> + </JPanel> + <JButton id='goNextPage'/> + <JButton id='goLastPage'/> + </JToolBar> + </cell> + </row> +</JAXXTab> Copied: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/JSynchronizeTab.jaxx (from rev 1538, branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JSynchronizeTab.jaxx) =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/JSynchronizeTab.jaxx (rev 0) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/JSynchronizeTab.jaxx 2009-01-21 02:13:01 UTC (rev 1541) @@ -0,0 +1,92 @@ +<JAXXTab insets='0,0,0,0'> + <style source="common.css"/> + <script> +public JTree getTree(boolean remote) { + return remote ? treeRemote : treeLocal; +} +public AbstractButton getExpandButton(boolean remote) { + return remote ? expandAllRemote : expandAllLocal; +} +public AbstractButton getCollapseButton(boolean remote) { + return remote ? collapseAllRemote : collapseAllLocal; +} +public AbstractButton getExportButton(boolean remote) { + return remote ? exportElementToLocal : exportElementToRemote; +} +public AbstractButton getShowDetailButton(boolean remote) { + return remote ? showTabRemote_detail: showTabLocal_detail ; +} + </script> + <row> + <cell> + <Table id='toolbarNavigationLocal' styleClass='border' insets='0,0,0,0'> + <row> + <cell insets='0,5,0,0' weightx="1" fill='horizontal'> + <JLabel id='navigationHeaderLocal' icon='{createImageIcon("action/local.png")}' text='simexplorer.node.navigation.local'/> + </cell> + <cell anchor="east"> + <JToolBar> + <JButton id='showTabLocal_detail'/> + <JButton id='collapseAllLocal'/> + <JButton id='expandAllLocal'/> + </JToolBar> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell> + <Table id='toolbarNavigationRemote' styleClass='border' insets='0,0,0,0'> + <row> + <cell insets='0,5,0,0' weightx="1" fill='horizontal'> + <JLabel id='navigationHeaderRemote' icon='{createImageIcon("action/remote.png")}' text='simexplorer.node.navigation.remote'/> + </cell> + <cell anchor="east"> + <JToolBar> + <JButton id='showTabRemote_detail'/> + <JButton id='collapseAllRemote'/> + <JButton id='expandAllRemote'/> + </JToolBar> + </cell> + </row> + </Table> + </cell> + </row> + <row fill="both"> + <cell weightx="1" weighty="1"> + <JScrollPane columnHeaderView='{toolbarNavigationLocal}' horizontalScrollBarPolicy='horizontal_scrollbar_always' verticalScrollBarPolicy='vertical_scrollbar_always'> + <JTree id='treeLocal' model='{new javax.swing.tree.DefaultTreeModel(null)}'/> + </JScrollPane> + </cell> + <cell fill='vertical'> + <Table> + <row fill='both' weightx="1" weighty="1"> + <cell> + <JPanel/> + </cell> + </row> + <row> + <cell> + <JPanel> + <JToolBar orientation='{JToolBar.VERTICAL}'> + <JButton id='exportElementToRemote'/> + <JButton id='exportElementToLocal'/> + </JToolBar> + </JPanel> + </cell> + </row> + <row fill='both' weightx="1" weighty="1"> + <cell> + <JPanel/> + </cell> + </row> + </Table> + </cell> + <cell weightx="1" weighty="1"> + <JScrollPane columnHeaderView='{toolbarNavigationRemote}' horizontalScrollBarPolicy='horizontal_scrollbar_always' verticalScrollBarPolicy='vertical_scrollbar_always'> + <JTree id='treeRemote' model='{new javax.swing.tree.DefaultTreeModel(null)}'/> + </JScrollPane> + </cell> + </row> +</JAXXTab> Copied: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/LoginUI.jaxx (from rev 1538, branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/LoginUI.jaxx) =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/LoginUI.jaxx (rev 0) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/LoginUI.jaxx 2009-01-21 02:13:01 UTC (rev 1541) @@ -0,0 +1,86 @@ +<JDialog title='simexplorer.login.title' modal='true'> + <script> + public static abstract class LoginUIHandler { + + boolean cancel; + + LoginUI ui; + + protected abstract boolean connect(String login, char[] password); + + protected abstract boolean failedToConnect(); + + public abstract void doConnect(); + + public abstract void doCancel(); + + protected void setUi(LoginUI ui) { + this.ui = ui; + } + + public void setCancel(boolean cancel) { + this.cancel = cancel; + } + + public boolean isCancel() { + return cancel; + } + } + + protected LoginUIHandler handler; + + public boolean launch(String login) { + if (login != null) { + this.getLogin().setText(login); + } + setVisible(true); + return !handler.cancel; + } + + public LoginUI(JFrame instance, LoginUIHandler handler) { + super(instance); + this.handler = handler; + this.handler.setUi(this); + // block close operation + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + } + + protected void doConnect() { + handler.doConnect(); + if (handler.isCancel()) { + doCancel(); + } + } + + protected void doCancel() { + handler.doCancel(); + dispose(); + } + </script> + <Table> + <row fill='horizontal'> + <cell> + <JLabel text='simexplorer.common.login' labelFor='{login}'/> + </cell> + <cell> + <JTextField id='login' onKeyReleased='ok.setEnabled(login.getText().trim().length()>0 && password.getPassword().length>0)'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel text='simexplorer.common.passphrase' labelFor='{password}'/> + </cell> + <cell> + <JPasswordField id='password' onKeyReleased='ok.setEnabled(login.getText().trim().length()>0 && password.getPassword().length>0)'/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton id='ok' text='simexplorer.common.apply' onActionPerformed="doConnect()" enabled='false'/> + <JButton text='simexplorer.common.cancel' onActionPerformed="doCancel()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Copied: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx (from rev 1538, branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx) =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx (rev 0) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx 2009-01-21 02:13:01 UTC (rev 1541) @@ -0,0 +1,67 @@ +<JFrame name="mainFrame" title='simexplorer.main.ui.title' + defaultCloseOperation='DISPOSE_ON_CLOSE' width='700' height='520'> + <style source="/common.css"/> + <script> +public Action getConnectAction(boolean isConnected) { + if (isConnected) { + return getConnect().getAction(); + } else { + return getUnconnect().getAction(); + } +} + </script><JMenuBar> + <!-- menu principal --> + <JMenu text='simexplorer.main.menu' mnemonic="{'M'}"> + <JMenuItem id="connect"/> + <JMenuItem id="unconnect"/> + <JSeparator/> + <JMenuItem id="showTab_local" mnemonic="{'l'}"/> + <JMenuItem id="showTab_remote"/> + <JSeparator/> + <JMenuItem id="quit"/> + </JMenu> + <!-- menu config --> + <JMenu text='simexplorer.config.menu' mnemonic="{'C'}"> + <JMenu text='simexplorer.config.i18n.menu' mnemonic="{'L'}" + icon='{createImageIcon("action/translate.png")}'> + <JMenuItem id="i18n_fr"/> + <JMenuItem id="i18n_en"/> + </JMenu> + <JMenuItem id="config"/> + <JMenuItem id="resetPassword"/> + <JMenuItem id="historyReset"/> + </JMenu> + <!-- menu aide --> + <JMenu text='simexplorer.help.menu' mnemonic="{'e'}"> + <JMenuItem id="help"/> + <JMenuItem id="site"/> + <JMenuItem id="about"/> + </JMenu> + <JMenu id="debug" text='simexplorer.debug.menu'> + <JMenuItem id="generateData"/> + </JMenu> + </JMenuBar> + <Table insets='0,0,0,0'> + <!-- la barre des actions générales --> + <row> + <cell fill="horizontal"> + <JToolBar borderPainted='true'> + <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_local'/> + <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_remote'/> + </JToolBar> + </cell> + </row> + <!-- le panel principal à surcharger selon le context --> + <row fill="both" weightx="1" weighty="1"> + <cell> + <JTabbedPane id="content"/> + </cell> + </row> + <!-- la barre de status --> + <row> + <cell fill="both"> + <org.codelutin.widget.StatusBar id='statusBar'/> + </cell> + </row> + </Table> +</JFrame> Copied: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/common.css (from rev 1538, branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/common.css) =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/common.css (rev 0) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/common.css 2009-01-21 02:13:01 UTC (rev 1541) @@ -0,0 +1,40 @@ +JToolBar { + floatable:false; + focusable:false; + opaque:false; + margin:0; + borderPainted:false; +} + +JButton { + opaque:false; + borderPainted:false; + enabled:false; + margin:0; +} + +JAXXToggleButton { + enabled:false; + focusPainted:false; +} + +JMenuItem { + enabled:false; +} + +JMenu { + enabled:true; +} + +JComboBox{ + font-size:9; +} + +.smallSize { + font-size:9; +} +.border { + border:{javax.swing.border.LineBorder.createBlackLineBorder()}; + height:22; +} + Copied: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/util (from rev 1538, branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/util) Copied: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties (from rev 1538, branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/resources/commandline.properties) =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties (rev 0) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2009-01-21 02:13:01 UTC (rev 1541) @@ -0,0 +1,88 @@ +############################################################################### +### Option definitions ######################################################## +############################################################################### + +# TODO define them + +############################################################################### +### Local configuration definition ############################################ +############################################################################### + +local.config.definition.db=java.io.File:/var/local/simexplorer/local-db +local.config.modifiers.db=mandatory + +local.config.definition.optimizePeriod=java.lang.Integer:3600 +local.config.modifiers.optimizePeriod=mandatory + +local.config.definition.data=java.io.File:/var/local/simexplorer/local-data +local.config.modifiers.data=mandatory + +############################################################################### +### Remote configuration definition ########################################### +############################################################################### + +remote.config.definition.login=java.lang.String +remote.config.modifiers.login=mandatory + +remote.config.definition.password=java.lang.String +remote.config.modifiers.password= + +remote.config.definition.URI=java.net.URI:jnp://localhost:1099 +remote.config.modifiers.URI=static,mandatory + +remote.config.definition.useProxy=java.lang.Boolean:False +remote.config.modifiers.useProxy= + +remote.config.definition.useAuthenticationProxy=java.lang.Boolean:False +remote.config.modifiers.useAuthenticationProxy= + +remote.config.definition.proxyLogin=java.lang.String +remote.config.modifiers.proxyLogin= + +remote.config.definition.proxyPassword=java.lang.String +remote.config.modifiers.proxyPassword= + +############################################################################### +### Main configuration definition ############################################# +############################################################################### + +### +### Application global properties +### + +main.config.definition.debugMode=java.lang.Boolean:false +main.config.modifiers.debugMode=mandatory + +#main.config.definition.smtpServer=java.lang.String:smtp +#main.config.modifiers.smtpServer=mandatory + +### +### Application preferences +### +main.config.definition.localSizor=org.codelutin.util.SimplePaginationEnum:_5 +main.config.modifiers.localSizor= + +main.config.definition.remoteSizor=org.codelutin.util.SimplePaginationEnum:_20 +main.config.modifiers.remoteSizor= + +main.config.definition.showLocalTab=java.lang.Boolean:True +main.config.modifiers.showLocalTab= + +main.config.definition.showRemoteTab=java.lang.Boolean:False +main.config.modifiers.showRemoteTab= + +main.config.definition.autoConnect=java.lang.Boolean:False +main.config.modifiers.autoConnect= + +### +### user properties +### + +main.config.definition.userFirstName=java.lang.String +main.config.modifiers.userFirstName=mandatory + +main.config.definition.userLastName=java.lang.String +main.config.modifiers.userLastName=mandatory + +main.config.definition.userMail=java.lang.String +main.config.modifiers.userMail=mandatory Modified: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2009-01-21 01:20:45 UTC (rev 1540) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2009-01-21 02:13:01 UTC (rev 1541) @@ -14,6 +14,7 @@ simexplorer.action.connect=Connect simexplorer.action.connect.help= simexplorer.action.connect.tooltip=Connect to remote server +simexplorer.action.currentPage=page simexplorer.action.deleteElement=Delete element simexplorer.action.deleteElement.help= simexplorer.action.deleteElement.tooltip=Delete element ''{0}'' @@ -93,6 +94,7 @@ simexplorer.action.search=search simexplorer.action.search.help= simexplorer.action.search.tooltip=Launch search +simexplorer.action.searchText.tooltip=Text to search in applications simexplorer.action.showTab_detail=Show details simexplorer.action.showTab_detail.help= simexplorer.action.showTab_detail.tooltip=show Detail of element ''{0}'' @@ -110,21 +112,81 @@ simexplorer.action.unconnect.tooltip=Disconnect from remote server simexplorer.choose.applicationexploration=Choose a application's exploration (*.zip) simexplorer.choose.dir=Choose this directory +simexplorer.choose.import.label=Import type simexplorer.choose.library=Choose a library file (*.?) +simexplorer.common.apply=Apply +simexplorer.common.cancel=Cancel +simexplorer.common.close=Close simexplorer.common.creationDate=create date simexplorer.common.description=description simexplorer.common.elementClass=type simexplorer.common.key=key +simexplorer.common.login=Login simexplorer.common.name=name +simexplorer.common.ok=Ok +simexplorer.common.passphrase=Password +simexplorer.common.type=type simexplorer.common.value=value simexplorer.common.version=version +simexplorer.config.i18n.menu=Language +simexplorer.config.local.data.description=Local database data directory +simexplorer.config.local.db.description=Local database directory +simexplorer.config.local.description=Local server configuration +simexplorer.config.local.optimizePeriod.description=Optimize period (Lucene) +simexplorer.config.main.autoConnect.description=Flag to auto connect to remote server at init time +simexplorer.config.main.configFileName.description=The path of the configuration file +simexplorer.config.main.copyright.description= +simexplorer.config.main.debugMode.description=Debug mode +simexplorer.config.main.description=Configuration de l'application SimExplorer SI +simexplorer.config.main.encoding.description=Encoding of application +simexplorer.config.main.localSizor.description=number of result to display by page in local list +simexplorer.config.main.locale.description=User locale +simexplorer.config.main.organisationName.description= +simexplorer.config.main.organisationURL.description= +simexplorer.config.main.projectName.description=name of PRoject +simexplorer.config.main.projectURL.description= +simexplorer.config.main.remoteSizor.description=number of result to display by page in remote list +simexplorer.config.main.showLocalTab.description=Show at launch time, the local tab +simexplorer.config.main.showRemoteTab.description=Show at launch time, the remote tab +simexplorer.config.main.userFirstName.description=User first name +simexplorer.config.main.userLastName.description=User last name +simexplorer.config.main.userMail.description=User email adress +simexplorer.config.main.version.description=Version of application +simexplorer.config.menu=Configuration +simexplorer.config.remote.URI.description=URI of the remote storage service +simexplorer.config.remote.description=Remote server configuration +simexplorer.config.remote.login.description=User login to remote server +simexplorer.config.remote.password.description=User password to connect remote server +simexplorer.config.remote.proxyLogin.description=login to proxy host +simexplorer.config.remote.proxyPassword.description=password to proxy host +simexplorer.config.remote.useAuthenticationProxy.description=use an anthenticated proxy +simexplorer.config.remote.useProxy.description=use a proxy host toreach remote server simexplorer.confirm.delete=Confirm delete of ''{0}'' +simexplorer.debug.menu=Debug +simexplorer.entities.applicationExploration=Exploration Application +simexplorer.entities.library=Library +simexplorer.error.dialog.message=An error was found +simexplorer.error.dialog.title=Error detected\! simexplorer.error.login.failed=Remote authentication failed... simexplorer.error.service.failed=Remote server is not reachable... +simexplorer.help.menu=Help simexplorer.login.retry=Do you want to retry ? +simexplorer.login.title=Authentication to remote server +simexplorer.main.menu=Main +simexplorer.main.ui.title=SimExplorer SI v 0.1 simexplorer.node.descriptors=Descriptor(s) ({0}) +simexplorer.node.navigation.local=Local element +simexplorer.node.navigation.remote=Remote element simexplorer.node.noattachments=No attachment simexplorer.node.nodetail=No detail +simexplorer.option.description.changeConfig=change value of configuration property (with **key**) by value **value**. +simexplorer.option.description.changeFileConfig=specify the configuration's file to load +simexplorer.option.description.editConfig=to launch UI of configuration editor +simexplorer.option.description.help=Show this help +simexplorer.option.description.helpConfig=Show config properties help +simexplorer.option.description.resetConfig=Reset user configuration. +simexplorer.option.description.showConfig=See configuration details +simexplorer.option.description.ui=launch or not user interface (**flag**) simexplorer.tab.detail=Detail simexplorer.tab.detail.tooltip=Screen of details of an element simexplorer.tab.local=Local elements Modified: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2009-01-21 01:20:45 UTC (rev 1540) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2009-01-21 02:13:01 UTC (rev 1541) @@ -14,6 +14,7 @@ simexplorer.action.connect=Connexion simexplorer.action.connect.help= simexplorer.action.connect.tooltip=Se connecter au serveur distant +simexplorer.action.currentPage=page simexplorer.action.deleteElement=Supprimer simexplorer.action.deleteElement.help= simexplorer.action.deleteElement.tooltip=Supprimer l''\u00E9l\u00E9ment ''{0}'' @@ -93,6 +94,7 @@ simexplorer.action.search=chercher simexplorer.action.search.help= simexplorer.action.search.tooltip=Lancer la recherche +simexplorer.action.searchText.tooltip=Le texte de recherche simexplorer.action.showTab_detail=Voir les d\u00E9tails simexplorer.action.showTab_detail.help= simexplorer.action.showTab_detail.tooltip=Afficher les d\u00E9tails de l''\u00E9l\u00E9ment ''{0}'' @@ -110,21 +112,81 @@ simexplorer.action.unconnect.tooltip=Se d\u00E9connecter du serveur distant simexplorer.choose.applicationexploration=Choisir une exploration d'application (*.zip) simexplorer.choose.dir=Choisir ce r\u00E9pertoire +simexplorer.choose.import.label=Type d'\u00E9l\u00E9ment \u00E0 importer simexplorer.choose.library=Choisir une librairie (*.?) +simexplorer.common.apply=Appliquer +simexplorer.common.cancel=Annuler +simexplorer.common.close=Fermer simexplorer.common.creationDate=date de cr\u00E9ation simexplorer.common.description=description simexplorer.common.elementClass=type simexplorer.common.key=nom descriptor +simexplorer.common.login=Login utilisateur simexplorer.common.name=nom +simexplorer.common.ok=Ok +simexplorer.common.passphrase=Mot de passe +simexplorer.common.type=type simexplorer.common.value=valeur simexplorer.common.version=version +simexplorer.config.i18n.menu=Langue +simexplorer.config.local.data.description=R\u00E9pertoire des donn\u00E9es de la base locale +simexplorer.config.local.db.description=R\u00E9pertoire de la base locale +simexplorer.config.local.description=Configuration du serveur local +simexplorer.config.local.optimizePeriod.description=La p\u00E9riode optimale (Lucene) +simexplorer.config.main.autoConnect.description=Se connecter automatiquement au d\u00E9marrage +simexplorer.config.main.configFileName.description=Le chemin du fichier de configuration +simexplorer.config.main.copyright.description= +simexplorer.config.main.debugMode.description=Mode debug +simexplorer.config.main.description=La configuration de l'application +simexplorer.config.main.encoding.description=L'encoding du syst\u00E8me +simexplorer.config.main.localSizor.description=Nombre de r\u00E9sultats par page dans la liste locale +simexplorer.config.main.locale.description=La langue de l'utilisateur +simexplorer.config.main.organisationName.description= +simexplorer.config.main.organisationURL.description= +simexplorer.config.main.projectName.description=Le nom du projet +simexplorer.config.main.projectURL.description= +simexplorer.config.main.remoteSizor.description=Nombre de r\u00E9sultats par page dans la liste distante +simexplorer.config.main.showLocalTab.description=Voir au d\u00E9marrage l'onglet Local +simexplorer.config.main.showRemoteTab.description=Voir au d\u00E9mrrage l'onglet Distant +simexplorer.config.main.userFirstName.description=Le pr\u00E9nom de l'utilisateur +simexplorer.config.main.userLastName.description=Le nom de l'utilisateur +simexplorer.config.main.userMail.description=Le courriel de l'utilisateur +simexplorer.config.main.version.description=La version du logiciel +simexplorer.config.menu=Configuration +simexplorer.config.remote.URI.description=l'uri du service distant +simexplorer.config.remote.description=Configuration du serveur distant +simexplorer.config.remote.login.description=Le login de l'utilisateur au service distant +simexplorer.config.remote.password.description=Le mot de passe utilisateur (non visible) au serveur distant +simexplorer.config.remote.proxyLogin.description=Login proxy +simexplorer.config.remote.proxyPassword.description=Mot de passe proxy +simexplorer.config.remote.useAuthenticationProxy.description=utilise une authentification sur le proxy +simexplorer.config.remote.useProxy.description=utilise un proxy pour atteindre le serveur distant simexplorer.confirm.delete=Confirmer la suppression de ''{0}'' +simexplorer.debug.menu=Debug +simexplorer.entities.applicationExploration=Exploration d'application +simexplorer.entities.library=Librairie +simexplorer.error.dialog.message=Une erreur est survenue\! +simexplorer.error.dialog.title=Erreur detect\u00E9e simexplorer.error.login.failed=L'authentification a \u00E9chou\u00E9e... simexplorer.error.service.failed=Le serveur central n'est pas joignable +simexplorer.help.menu=Aide simexplorer.login.retry=Voulez-vous ressayer de vous connecter ? +simexplorer.login.title=Connexion au serveur central +simexplorer.main.menu=Menu principal +simexplorer.main.ui.title=SimExplorer SI v 0.1 simexplorer.node.descriptors=Descripteur(s) ({0}) +simexplorer.node.navigation.local=\u00E9l\u00E9ment local +simexplorer.node.navigation.remote=\u00E9l\u00E9ment distant simexplorer.node.noattachments=Pas de fichier attach\u00E9 simexplorer.node.nodetail=Pas de d\u00E9tail +simexplorer.option.description.changeConfig=remplace la valeur d'une propri\u00E9t\u00E9 de clef **key** de la configuration par la valeur **value**. +simexplorer.option.description.changeFileConfig=sp\u00E9cifer le fichier de configuration utilis\u00E9 +simexplorer.option.description.editConfig=pour lancer l'UI d'\u00E9dition de la configuration +simexplorer.option.description.help=Voir cette aide +simexplorer.option.description.helpConfig=Voir l'aide des propri\u00E9t\u00E9s de configuration +simexplorer.option.description.resetConfig=R\u00E9initialisation de la configuration. +simexplorer.option.description.showConfig=Voir les d\u00E9tails d'une configuration +simexplorer.option.description.ui=Lancer ou non l'interface ui simexplorer.tab.detail=D\u00E9tail simexplorer.tab.detail.tooltip=L'\u00E9cran affichant les d\u00E9tails d'un \u00E9l\u00E9ment simexplorer.tab.local=Liste locale Copied: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/icons (from rev 1538, branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/resources/icons) Modified: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/log4j.properties =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/log4j.properties 2009-01-21 01:20:45 UTC (rev 1540) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/resources/log4j.properties 2009-01-21 02:13:01 UTC (rev 1541) @@ -1,5 +1,5 @@ # Global logging configuration -log4j.rootLogger=ERROR, stdout +log4j.rootLogger=DEBUG, stdout # Console output... log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout Added: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/site/en/rst/user/SimExplorerUsage.rst =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/site/en/rst/user/SimExplorerUsage.rst (rev 0) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/site/en/rst/user/SimExplorerUsage.rst 2009-01-21 02:13:01 UTC (rev 1541) @@ -0,0 +1,161 @@ +======================= +**SimExplorer**'s usage +======================= + +Launch commands +--------------- + +#. [--show-config]* <all|local|main|remote> [normal|complete|tec] + See configuration details + + +#. --edit-config + to launch UI of configuration editor + + +#. --config-file <configFile:FILE> + specify the configuration's file to load + + +#. [--config]* <key:STRING> <value:STRING> [local|main|remote] + change value of configuration property (with **key**) by value **value**. + + +#. --help|-h + Show this help + + +#. [--help-config]* <all|local|main|remote> + Show config properties help + + +#. --reset-config + Reset user configuration. + + +#. --ui <flag:BOOLEAN> + launch or not user interface (**flag**) + +Configurations of **SimExplorer** +--------------------------------- + +Local server configuration (local) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +#. data (File) <defaultValue:/var/local/simexplorer/local-data> + Local database data directory + + +#. db (File) <defaultValue:/var/local/simexplorer/local-db> + Local database directory + + +#. optimizePeriod (Integer) <defaultValue:3600> + Optimize period (Lucene) + + +Configuration de l'application SimExplorer SI (main) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +#. autoConnect (Boolean) <defaultValue:false> + Flag to auto connect to remote server at init time + + +#. configFileName (File) <defaultValue:.simexplorer-si-1> + The path of the configuration file + + +#. copyright (String) <defaultValue:Copyright Cemagref 2008> + simexplorer.config.main.copyright.description + + +#. debugMode (Boolean) <defaultValue:false> + Debug mode + + +#. encoding (String) <defaultValue:UTF-8> + Encoding of application + + +#. localSizor (SimplePaginationEnum) <defaultValue:5> + number of result to display by page in local list + + +#. locale (Locale) <defaultValue:en_GB> + User locale + + +#. organisationName (String) <defaultValue:Cemagref> + simexplorer.config.main.organisationName.description + + +#. organisationURL (URL) <defaultValue:http://www.cemagref.fr> + simexplorer.config.main.organisationURL.description + + +#. projectName (String) <defaultValue:SimExplorer-SI> + name of PRoject + + +#. projectURL (URL) <defaultValue:http://simexplorer-si.labs.libre-entreprise.org> + simexplorer.config.main.projectURL.description + + +#. remoteSizor (SimplePaginationEnum) <defaultValue:20> + number of result to display by page in remote list + + +#. showLocalTab (Boolean) <defaultValue:true> + Show at launch time, the local tab + + +#. showRemoteTab (Boolean) <defaultValue:false> + Show at launch time, the remote tab + + +#. userFirstName (String) + User first name + + +#. userLastName (String) + User last name + + +#. userMail (String) + User email adress + + +#. version (VersionNumber) <defaultValue:1.0> + Version of application + + +Remote server configuration (remote) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +#. URI (URI) <defaultValue:jnp://localhost:1099> + URI of the remote storage service + + +#. login (String) + User login to remote server + + +#. password (String) + User password to connect remote server + + +#. proxyLogin (String) + login to proxy host + + +#. proxyPassword (String) + password to proxy host + + +#. useAuthenticationProxy (Boolean) <defaultValue:false> + use an anthenticated proxy + + +#. useProxy (Boolean) <defaultValue:false> + use a proxy host toreach remote server + Added: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/site/fr/rst/user/SimExplorerUsage.rst =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/site/fr/rst/user/SimExplorerUsage.rst (rev 0) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/site/fr/rst/user/SimExplorerUsage.rst 2009-01-21 02:13:01 UTC (rev 1541) @@ -0,0 +1,161 @@ +====================================== +Guide d'utilisation de **SimExplorer** +====================================== + +Les commandes de lancement de **SimExplorer** +--------------------------------------------- + +#. [--show-config]* <all|local|main|remote> [normal|complete|tec] + Voir les détails d'une configuration + + +#. --edit-config + pour lancer l'UI d'édition de la configuration + + +#. --config-file <configFile:FILE> + spécifer le fichier de configuration utilisé + + +#. [--config]* <key:STRING> <value:STRING> [local|main|remote] + remplace la valeur d'une propriété de clef **key** de la configuration par la valeur **value**. + + +#. --help|-h + Voir cette aide + + +#. [--help-config]* <all|local|main|remote> + Voir l'aide des propriétés de configuration + + +#. --reset-config + Réinitialisation de la configuration. + + +#. --ui <flag:BOOLEAN> + Lancer ou non l'interface ui + +Les configurations de **SimExplorer** +------------------------------------- + +Configuration du serveur local (local) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +#. data (File) <defaultValue:/var/local/simexplorer/local-data> + Répertoire des données de la base locale + + +#. db (File) <defaultValue:/var/local/simexplorer/local-db> + Répertoire de la base locale + + +#. optimizePeriod (Integer) <defaultValue:3600> + La période optimale (Lucene) + + +La configuration de l'application (main) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +#. autoConnect (Boolean) <defaultValue:false> + Se connecter automatiquement au démarrage + + +#. configFileName (File) <defaultValue:.simexplorer-si-1> + Le chemin du fichier de configuration + + +#. copyright (String) <defaultValue:Copyright Cemagref 2008> + simexplorer.config.main.copyright.description + + +#. debugMode (Boolean) <defaultValue:false> + Mode debug + + +#. encoding (String) <defaultValue:UTF-8> + L'encoding du système + + +#. localSizor (SimplePaginationEnum) <defaultValue:5> + Nombre de résultats par page dans la liste locale + + +#. locale (Locale) <defaultValue:en_GB> + La langue de l'utilisateur + + +#. organisationName (String) <defaultValue:Cemagref> + simexplorer.config.main.organisationName.description + + +#. organisationURL (URL) <defaultValue:http://www.cemagref.fr> + simexplorer.config.main.organisationURL.description + + +#. projectName (String) <defaultValue:SimExplorer-SI> + Le nom du projet + + +#. projectURL (URL) <defaultValue:http://simexplorer-si.labs.libre-entreprise.org> + simexplorer.config.main.projectURL.description + + +#. remoteSizor (SimplePaginationEnum) <defaultValue:20> + Nombre de résultats par page dans la liste distante + + +#. showLocalTab (Boolean) <defaultValue:true> + Voir au démarrage l'onglet Local + + +#. showRemoteTab (Boolean) <defaultValue:false> + Voir au démrrage l'onglet Distant + + +#. userFirstName (String) + Le prénom de l'utilisateur + + +#. userLastName (String) + Le nom de l'utilisateur + + +#. userMail (String) + Le courriel de l'utilisateur + + +#. version (VersionNumber) <defaultValue:1.0> + La version du logiciel + + +Configuration du serveur distant (remote) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +#. URI (URI) <defaultValue:jnp://localhost:1099> + l'uri du service distant + + +#. login (String) + Le login de l'utilisateur au service distant + + +#. password (String) + Le mot de passe utilisateur (non visible) au serveur distant + + +#. proxyLogin (String) + Login proxy + + +#. proxyPassword (String) + Mot de passe proxy + + +#. useAuthenticationProxy (Boolean) <defaultValue:false> + utilise une authentification sur le proxy + + +#. useProxy (Boolean) <defaultValue:false> + utilise un proxy pour atteindre le serveur distant + Deleted: branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/resources/commandline.properties =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/resources/commandline.properties 2009-01-21 01:20:45 UTC (rev 1540) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/resources/commandline.properties 2009-01-21 02:13:01 UTC (rev 1541) @@ -1,88 +0,0 @@ -############################################################################### -### Option definitions ######################################################## -############################################################################### - -# TODO define them - -############################################################################### -### Local configuration definition ############################################ -############################################################################### - -local.config.definition.db=java.io.File:/var/local/simexplorer/local-db -local.config.modifiers.db=mandatory - -local.config.definition.optimizePeriod=java.lang.Integer:3600 -local.config.modifiers.optimizePeriod=mandatory - -local.config.definition.data=java.io.File:/var/local/simexplorer/local-data -local.config.modifiers.data=mandatory - -############################################################################### -### Remote configuration definition ########################################### -############################################################################### - -remote.config.definition.login=java.lang.String -remote.config.modifiers.login=mandatory - -remote.config.definition.password=java.lang.String -remote.config.modifiers.password= - -remote.config.definition.URI=java.net.URI:jnp://localhost:1099 -remote.config.modifiers.URI=static,mandatory - -remote.config.definition.useProxy=java.lang.Boolean:False -remote.config.modifiers.useProxy= - -remote.config.definition.useAuthenticationProxy=java.lang.Boolean:False -remote.config.modifiers.useAuthenticationProxy= - -remote.config.definition.proxyLogin=java.lang.String -remote.config.modifiers.proxyLogin= - -remote.config.definition.proxyPassword=java.lang.String -remote.config.modifiers.proxyPassword= - -############################################################################### -### Main configuration definition ############################################# -############################################################################### - -### -### Application global properties -### - -main.config.definition.debugMode=java.lang.Boolean:false -main.config.modifiers.debugMode=mandatory - -#main.config.definition.smtpServer=java.lang.String:smtp -#main.config.modifiers.smtpServer=mandatory - -### -### Application preferences -### -main.config.definition.localSizor=org.codelutin.util.SimplePaginationEnum:_5 -main.config.modifiers.localSizor= - -main.config.definition.remoteSizor=org.codelutin.util.SimplePaginationEnum:_20 -main.config.modifiers.remoteSizor= - -main.config.definition.showLocalTab=java.lang.Boolean:True -main.config.modifiers.showLocalTab= - -main.config.definition.showRemoteTab=java.lang.Boolean:False -main.config.modifiers.showRemoteTab= - -main.config.definition.autoConnect=java.lang.Boolean:False -main.config.modifiers.autoConnect= - -### -### user properties -### - -main.config.definition.userFirstName=java.lang.String -main.config.modifiers.userFirstName=mandatory - -main.config.definition.userLastName=java.lang.String -main.config.modifiers.userLastName=mandatory - -main.config.definition.userMail=java.lang.String -main.config.modifiers.userMail=mandatory Deleted: branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx 2009-01-21 01:20:45 UTC (rev 1540) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx 2009-01-21 02:13:01 UTC (rev 1541) @@ -1,82 +0,0 @@ -<JDialog> - <script> -AbstractAction cancelAction = new AbstractAction(_("simexplorer.common.cancel")){ - private static final long serialVersionUID = -4585698788717305452L; - - public void actionPerformed(ActionEvent e) { - filePath.setText(null); - dispose(); - } -}; - -public java.io.File getFile() { - setVisible(true); - if (filePath.getText().equals("")) { - return null; - } - java.io.File f= new java.io.File(filePath.getText()); - filePath.setText(null); - return f; -} - -private java.util.Map<String, String[]> filters; - -protected void chooseDir() { - String type = (String) getTypeImport().getSelectedValue(); - String[] filter = this.filters.get(type); - File dir= org.codelutin.util.FileUtil.getFile(filter==null?null:filter); - if (dir!=null) { - filePath.setText(dir.toString()); - } -} -protected void check() { - String t = filePath.getText(); - java.io.File f = new File(t); - ok.setEnabled(!t.equals("") && f.exists() && f.isFile()); -} - -public ImportDialog(JFrame frame,java.util.Map<String,String[]> filters) { - super(frame,true); - JRootPane rootPane = getRootPane(); - rootPane.setDefaultButton(ok); - rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"),"cancel"); - rootPane.getActionMap().put("cancel", cancelAction); - this.filters = filters; -} - </script> - <Table> - <row fill='vertical'> - <cell anchor='west' fill='horizontal' weightx="2"> - <JLabel text='simexplorer.choose.import.label'/> - </cell> - <cell anchor='west'> - <VBox> - <JRadioButton id='selected' text='simexplorer.entities.applicationExploration' value='ApplicationExploration' buttonGroup='typeImport' onActionPerformed='filePath.setText(null)'/> - <JRadioButton text='simexplorer.entities.library' value='Library' buttonGroup='typeImport' onActionPerformed='filePath.setText(null)'/> - </VBox> - </cell> - </row> - <row> - <cell columns='2' weightx='1' fill='horizontal'> - <Table> - <row fill="both"> - <cell weightx='1' fill='both' insets='0,0,0,0'> - <JTextField id='filePath' onCaretUpdate='check()' margin='0,0,0,0'/> - </cell> - <cell anchor='east' insets='0,2,0,0'> - <JButton id='chooseDirectory' icon='{createImageIcon("fileChooser.png")}' onActionPerformed='chooseDir()' margin='0,0,0,0'/> - </cell> - </row> - </Table> - </cell> - </row> - <row fill='horizontal'> - <cell columns='2'> - <JPanel layout='{new GridLayout(1, 0, 2, 2)}'> - <JButton id='ok' text='simexplorer.action.importElement' enabled='false' onActionPerformed='dispose();'/> - <JButton id='cancel' text='simexplorer.common.cancel' action='{cancelAction}'/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx 2009-01-21 01:20:45 UTC (rev 1540) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx 2009-01-21 02:13:01 UTC (rev 1541) @@ -1,141 +0,0 @@ -<JAXXTab> - <style source="common.css"/> - <row> - <cell> - <!--TODO imposer une taille minimum --> - <Table id='toolbarNavigation' styleClass='border' insets='0,0,0,0'> - <row> - <cell anchor='west' insets='0,2,0,0' weightx="1" fill='horizontal' > - <JLabel id='detailHeaderFromLocal' opaque='false' visible='false' - text='simexplorer.node.navigation.local' - icon='{createImageIcon("action/local.png")}'/> - </cell> - <cell anchor='west' insets='0,2,0,0' weightx="1" fill='horizontal' > - <JLabel id='detailHeaderFromRemote' opaque='false' - text='simexplorer.node.navigation.remote' - visible='false' icon='{createImageIcon("action/remote.png")}'/> - </cell> - <cell anchor="east" insets='0,0,0,0'> - <JToolBar> - <JButton id='historyPrevious'/> - <JButton id='historyNext'/> - <JButton id='collapseAllDetail'/> - <JButton id='expandAllDetail'/> - </JToolBar> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell> - <Table id='toolbarDetail' styleClass='border' background='{Color.WHITE}' insets='0,0,0,0'> - <row> - <cell anchor='west' fill="vertical"> - <JToolBar> - <JButton id='detailToTree'/> - </JToolBar> - </cell> - <cell weightx="1" fill='horizontal'> - <JPanel opaque='false' > - <JLabel id='detailHeader' opaque='false' /> - </JPanel> - </cell> - <cell anchor="east"> - <JToolBar> - <JComboBox id='detailVersions' model='{new DefaultComboBoxModel()}'/> - <JButton id='showTab_synchronize'/> - <JButton id='exportElement'/> - <JButton id='downloadElement'/> - <JButton id='deleteElement'/> - </JToolBar> - </cell> - </row> - </Table> - </cell> - </row> - <row fill="both" weightx="1" weighty="1"> - <cell columns="2"> - <JSplitPane id='splitOne' orientation="horizontal" resizeWeight="0.45" oneTouchExpandable='true'> - <JScrollPane columnHeaderView='{toolbarNavigation}'> - <JTree id="navigationTree" model='{new javax.swing.tree.DefaultTreeModel(null)}' styleClass='smallSize'/> - </JScrollPane> - <JScrollPane id="scrollPane" columnHeaderView='{toolbarDetail}' border='{null}' horizontalScrollBarPolicy='horizontal_scrollbar_never' verticalScrollBarPolicy='vertical_scrollbar_never'> - <Table id='detail' insets='2,2,2,1'> - <row fill='vertical'> - <cell anchor='west'> - <JLabel text='simexplorer.common.type'/> - </cell> - <cell weightx="1" anchor='west'> - <JLabel id='detailType'/> - </cell> - </row> - <row fill='vertical'> - <cell anchor='west'> - <JLabel text='simexplorer.common.description'/> - </cell> - <cell fill='horizontal' weightx="2" anchor='west'> - <JLabel id='detailDescription'/> - </cell> - </row> - <row fill='vertical'> - <cell anchor='west'> - <JLabel text='simexplorer.common.creationDate'/> - </cell> - <cell anchor='west'> - <JLabel id='detailCreationDate'/> - </cell> - </row> - <row> - <cell fill='horizontal' columns="2" insets='3,0,0,1'> - <JPanel styleClass='border'> - <JLabel id='detailDescriptorsHeader'/> - </JPanel> - </cell> - </row> - <row> - <cell fill='horizontal' columns="2" insets='0,0,0,0'> - <JScrollPane id='scrollTable' border='{null}' horizontalScrollBarPolicy='horizontal_scrollbar_as_needed' verticalScrollBarPolicy='vertical_scrollbar_as_needed'> - <JTable id="detailTable" border='{null}' focusable='false' enabled='false' /> - <!--JTable id="detailTable" border='{null}' model='{new fr.cemagref.simexplorer.is.ui.swing.model.DetailTableModel()}' focusable='false' enabled='false' /--> - </JScrollPane> - </cell> - </row> - <row> - <cell fill="horizontal" columns="2" insets='3,0,0,1' > - <Table id='toolbarAttachment' styleClass='border' insets='0,0,0,0'> - <row fill='both'> - <cell weightx="1" fill='horizontal'> - <JPanel opaque='false'> - <JLabel id='detailAttachmentsHeader'/> - </JPanel> - </cell> - <cell fill='horizontal' anchor="east"> - <JToolBar> - <JButton id='downloadAttachment'/> - </JToolBar> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell fill='horizontal' columns="2" insets='0,0,0,0'> - <JScrollPane id='scrollAttachments' horizontalScrollBarPolicy='horizontal_scrollbar_as_needed' verticalScrollBarPolicy='vertical_scrollbar_as_needed'> - <JList id="detailAttachments" model='{new DefaultListModel()}' selectionMode='0'/> - </JScrollPane> - </cell> - </row> - <row weighty="1" weightx="2"> - <cell fill='both'> - <JPanel> - <JLabel text=''/> - </JPanel> - </cell> - </row> - </Table> - </JScrollPane> - </JSplitPane> - </cell> - </row> -</JAXXTab> Deleted: branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx 2009-01-21 01:20:45 UTC (rev 1540) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx 2009-01-21 02:13:01 UTC (rev 1541) @@ -1,57 +0,0 @@ -<JAXXTab> - <style source="common.css"/> - <script> -public void initPopup(){ - showTab_detail.setHideActionText(false); - showTab_synchronize.setHideActionText(false); - exportElement.setHideActionText(false); - downloadElement.setHideActionText(false); - deleteElement.setHideActionText(false); - importElement.setEnabled(true); - importElement.getAction().setEnabled(true); -} - </script> - <!-- la barre des actions de la liste --> - <row> - <cell fill='horizontal' insets='0,0,0,0'> - <JPopupMenu id="tablePopupMenu" invoker='{table}' enabled='false'> - <JMenuItem id='showTab_detail' hideActionText='false'/> - <JMenuItem id='showTab_synchronize'/> - <JMenuItem id='exportElement'/> - <JMenuItem id='downloadElement'/> - <JMenuItem id='deleteElement'/> - </JPopupMenu> - <JToolBar> - <JButton id='importElement'/> - <JButton id='resetSearch'/> - <JTextField id='searchText' toolTipText='simexplorer.action.searchText.tooltip'/> - <JButton id='search'/> - <JButton id='advancedSearch'/> - <org.codelutin.util.EnumEditor id='changeSizor' font-size='9' constructorParams="org.codelutin.util.SimplePaginationEnum.class" enabled='false' opaque='false' preferredSize='{new Dimension(50,5)}'/> - </JToolBar> - </cell> - </row> - <row fill='both' weightx='1' weighty='1'> - <cell insets='0,0,0,0'> - <JScrollPane> - <JTable id='table' selectionMode='{ListSelectionModel.SINGLE_SELECTION}'/> - <!--JTable id='table' model='{new fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel()}' selectionMode='{ListSelectionModel.SINGLE_SELECTION}'/--> - </JScrollPane> - </cell> - </row> - <!-- la barre de pagination de la liste --> - <row> - <cell anchor='center' insets='0,0,0,0'> - <JToolBar> - <JButton id='goFirstPage' enabled='{false}'/> - <JButton id='goPreviousPage' enabled='{false}'/> - <JPanel layout='{new GridLayout(0, 2, 0, 0)}'> - <JLabel id='currentPage' text='simexplorer.action.currentPage' labelFor="{goPage}" font-size='9'/> - <JComboBox id='goPage' enabled='false' font-size='9' opaque='false' preferredSize='{new Dimension(50,5)}'/> - </JPanel> - <JButton id='goNextPage'/> - <JButton id='goLastPage'/> - </JToolBar> - </cell> - </row> -</JAXXTab> Deleted: branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JSynchronizeTab.jaxx =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JSynchronizeTab.jaxx 2009-01-21 01:20:45 UTC (rev 1540) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/JSynchronizeTab.jaxx 2009-01-21 02:13:01 UTC (rev 1541) @@ -1,92 +0,0 @@ -<JAXXTab insets='0,0,0,0'> - <style source="common.css"/> - <script> -public JTree getTree(boolean remote) { - return remote ? treeRemote : treeLocal; -} -public AbstractButton getExpandButton(boolean remote) { - return remote ? expandAllRemote : expandAllLocal; -} -public AbstractButton getCollapseButton(boolean remote) { - return remote ? collapseAllRemote : collapseAllLocal; -} -public AbstractButton getExportButton(boolean remote) { - return remote ? exportElementToLocal : exportElementToRemote; -} -public AbstractButton getShowDetailButton(boolean remote) { - return remote ? showTabRemote_detail: showTabLocal_detail ; -} - </script> - <row> - <cell> - <Table id='toolbarNavigationLocal' styleClass='border' insets='0,0,0,0'> - <row> - <cell insets='0,5,0,0' weightx="1" fill='horizontal'> - <JLabel id='navigationHeaderLocal' icon='{createImageIcon("action/local.png")}' text='simexplorer.node.navigation.local'/> - </cell> - <cell anchor="east"> - <JToolBar> - <JButton id='showTabLocal_detail'/> - <JButton id='collapseAllLocal'/> - <JButton id='expandAllLocal'/> - </JToolBar> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell> - <Table id='toolbarNavigationRemote' styleClass='border' insets='0,0,0,0'> - <row> - <cell insets='0,5,0,0' weightx="1" fill='horizontal'> - <JLabel id='navigationHeaderRemote' icon='{createImageIcon("action/remote.png")}' text='simexplorer.node.navigation.remote'/> - </cell> - <cell anchor="east"> - <JToolBar> - <JButton id='showTabRemote_detail'/> - <JButton id='collapseAllRemote'/> - <JButton id='expandAllRemote'/> - </JToolBar> - </cell> - </row> - </Table> - </cell> - </row> - <row fill="both"> - <cell weightx="1" weighty="1"> - <JScrollPane columnHeaderView='{toolbarNavigationLocal}' horizontalScrollBarPolicy='horizontal_scrollbar_always' verticalScrollBarPolicy='vertical_scrollbar_always'> - <JTree id='treeLocal' model='{new javax.swing.tree.DefaultTreeModel(null)}'/> - </JScrollPane> - </cell> - <cell fill='vertical'> - <Table> - <row fill='both' weightx="1" weighty="1"> - <cell> - <JPanel/> - </cell> - </row> - <row> - <cell> - <JPanel> - <JToolBar orientation='{JToolBar.VERTICAL}'> - <JButton id='exportElementToRemote'/> - <JButton id='exportElementToLocal'/> - </JToolBar> - </JPanel> - </cell> - </row> - <row fill='both' weightx="1" weighty="1"> - <cell> - <JPanel/> - </cell> - </row> - </Table> - </cell> - <cell weightx="1" weighty="1"> - <JScrollPane columnHeaderView='{toolbarNavigationRemote}' horizontalScrollBarPolicy='horizontal_scrollbar_always' verticalScrollBarPolicy='vertical_scrollbar_always'> - <JTree id='treeRemote' model='{new javax.swing.tree.DefaultTreeModel(null)}'/> - </JScrollPane> - </cell> - </row> -</JAXXTab> Deleted: branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/LoginUI.jaxx =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/LoginUI.jaxx 2009-01-21 01:20:45 UTC (rev 1540) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/LoginUI.jaxx 2009-01-21 02:13:01 UTC (rev 1541) @@ -1,86 +0,0 @@ -<JDialog title='simexplorer.login.title' modal='true'> - <script> - public static abstract class LoginUIHandler { - - boolean cancel; - - LoginUI ui; - - protected abstract boolean connect(String login, char[] password); - - protected abstract boolean failedToConnect(); - - public abstract void doConnect(); - - public abstract void doCancel(); - - protected void setUi(LoginUI ui) { - this.ui = ui; - } - - public void setCancel(boolean cancel) { - this.cancel = cancel; - } - - public boolean isCancel() { - return cancel; - } - } - - protected LoginUIHandler handler; - - public boolean launch(String login) { - if (login != null) { - this.getLogin().setText(login); - } - setVisible(true); - return !handler.cancel; - } - - public LoginUI(JFrame instance, LoginUIHandler handler) { - super(instance); - this.handler = handler; - this.handler.setUi(this); - // block close operation - setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); - } - - protected void doConnect() { - handler.doConnect(); - if (handler.isCancel()) { - doCancel(); - } - } - - protected void doCancel() { - handler.doCancel(); - dispose(); - } - </script> - <Table> - <row fill='horizontal'> - <cell> - <JLabel text='simexplorer.common.login' labelFor='{login}'/> - </cell> - <cell> - <JTextField id='login' onKeyReleased='ok.setEnabled(login.getText().trim().length()>0 && password.getPassword().length>0)'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel text='simexplorer.common.passphrase' labelFor='{password}'/> - </cell> - <cell> - <JPasswordField id='password' onKeyReleased='ok.setEnabled(login.getText().trim().length()>0 && password.getPassword().length>0)'/> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton id='ok' text='simexplorer.common.apply' onActionPerformed="doConnect()" enabled='false'/> - <JButton text='simexplorer.common.cancel' onActionPerformed="doCancel()"/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx 2009-01-21 01:20:45 UTC (rev 1540) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx 2009-01-21 02:13:01 UTC (rev 1541) @@ -1,67 +0,0 @@ -<JFrame name="mainFrame" title='simexplorer.main.ui.title' - defaultCloseOperation='DISPOSE_ON_CLOSE' width='700' height='520'> - <style source="/common.css"/> - <script> -public Action getConnectAction(boolean isConnected) { - if (isConnected) { - return getConnect().getAction(); - } else { - return getUnconnect().getAction(); - } -} - </script><JMenuBar> - <!-- menu principal --> - <JMenu text='simexplorer.main.menu' mnemonic="{'M'}"> - <JMenuItem id="connect"/> - <JMenuItem id="unconnect"/> - <JSeparator/> - <JMenuItem id="showTab_local" mnemonic="{'l'}"/> - <JMenuItem id="showTab_remote"/> - <JSeparator/> - <JMenuItem id="quit"/> - </JMenu> - <!-- menu config --> - <JMenu text='simexplorer.config.menu' mnemonic="{'C'}"> - <JMenu text='simexplorer.config.i18n.menu' mnemonic="{'L'}" - icon='{createImageIcon("action/translate.png")}'> - <JMenuItem id="i18n_fr"/> - <JMenuItem id="i18n_en"/> - </JMenu> - <JMenuItem id="config"/> - <JMenuItem id="resetPassword"/> - <JMenuItem id="historyReset"/> - </JMenu> - <!-- menu aide --> - <JMenu text='simexplorer.help.menu' mnemonic="{'e'}"> - <JMenuItem id="help"/> - <JMenuItem id="site"/> - <JMenuItem id="about"/> - </JMenu> - <JMenu id="debug" text='simexplorer.debug.menu'> - <JMenuItem id="generateData"/> - </JMenu> - </JMenuBar> - <Table insets='0,0,0,0'> - <!-- la barre des actions générales --> - <row> - <cell fill="horizontal"> - <JToolBar borderPainted='true'> - <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_local'/> - <jaxx.runtime.swing.JAXXToggleButton id='toggleTab_remote'/> - </JToolBar> - </cell> - </row> - <!-- le panel principal à surcharger selon le context --> - <row fill="both" weightx="1" weighty="1"> - <cell> - <JTabbedPane id="content"/> - </cell> - </row> - <!-- la barre de status --> - <row> - <cell fill="both"> - <org.codelutin.widget.StatusBar id='statusBar'/> - </cell> - </row> - </Table> -</JFrame> Deleted: branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/common.css =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/common.css 2009-01-21 01:20:45 UTC (rev 1540) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing-generated/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/common.css 2009-01-21 02:13:01 UTC (rev 1541) @@ -1,40 +0,0 @@ -JToolBar { - floatable:false; - focusable:false; - opaque:false; - margin:0; - borderPainted:false; -} - -JButton { - opaque:false; - borderPainted:false; - enabled:false; - margin:0; -} - -JAXXToggleButton { - enabled:false; - focusPainted:false; -} - -JMenuItem { - enabled:false; -} - -JMenu { - enabled:true; -} - -JComboBox{ - font-size:9; -} - -.smallSize { - font-size:9; -} -.border { - border:{javax.swing.border.LineBorder.createBlackLineBorder()}; - height:22; -} - Added: branches/migration-200901/simexplorer-is/src/site/fr/rst/devel/migration2009.rst =================================================================== --- branches/migration-200901/simexplorer-is/src/site/fr/rst/devel/migration2009.rst (rev 0) +++ branches/migration-200901/simexplorer-is/src/site/fr/rst/devel/migration2009.rst 2009-01-21 02:13:01 UTC (rev 1541) @@ -0,0 +1,110 @@ +============== +SimExplorer SI +============== + +Abstract +~~~~~~~~ + +Ce document détaille la migration de l'application et la préparation de la version 1.0. + +passage en UTF-8 +---------------- + +Les fichiers suivants ont été modifiés et convertis en UTF-8 : + +:: + + simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java + simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/exceptions/SimExplorerException.java + simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/VersionGenerator.java + simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java + simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties + simexplorer-is/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties + simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/RuntimeType.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoFirstPageAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowTabAbstractAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoPreviousPageAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/AdvancedSearchAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GoLastPageAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAbstractAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAddAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryDeleteExportAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryUnconnectAction.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/DetailTabModel.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/SimExplorerAbstractTabModel.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/SynchronizeTabModel.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/HistoryModel.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java + simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/EntityTreeNodeHelper.java + simexplorer-is/src/site/fr/rst/rules.rst + simexplorer-is/src/site/fr/rst/index.rst + simexplorer-is/src/site/fr/rst/todo.rst + simexplorer-is/src/site/fr/rst/devel/enviro.rst + simexplorer-is/src/site/fr/rst/devel/old/glassfish.txt + simexplorer-is/src/site/fr/rst/devel/old/maven.rst + simexplorer-is/src/site/fr/rst/devel/index.rst + simexplorer-is/src/site/fr/rst/devel/implementation.rst + simexplorer-is/src/site/fr/rst/install.rst + + +Utilisation layout maven 2 +-------------------------- + +Le layout (i.e l'organisation physique des répertoires) ne respectait pas les convention préconisées par Maven 2, +car à l'heure où ce projet a été développé nous n'avions pas encore de super-pom (lutinproject) qui respectait ces conventions. + +Aujourd'hui, c'est le cas et nous nous baserons le sur le super-pom org.codelutin:lutinproject:3.3 + +Nous préconisons aussi l'utilisation de ces conventions car la plupart des plugin maven (dont les notres) les respectent et cela +facilite grandement l'écriture des poms de se baser sur ces conventions. + +Pour plus de renseignement, voir http://maven.apache.org/guides/introduction/introduction-to-the-standard-dir... + +Refactoring des poms +-------------------- + +Amélioration des poms du projet modules se basant sur les préconisations écrites par Sonatype http://books.sonatype.com/maven-book/reference/public-book.html + +En effet, un certain d'anit-pattern maven ont été introduits dans nos poms (par exemple l'utilisation de la variable current.version qui nous rend dépendant du super-pom du projet +alors que cela ne doit pas être le cas. + +Utilisation des nouveaux groupId de nos librairies et plugins +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Nous avons depuis peu changé le groupId de toutes nos libraires et plugin, à savoir : + +- org.codelutin pour les librairies et plugin (non projet multi-modules) +- org.codelutin.XXX (pour les librairies multi-modules). + +Passage sur des versions stables de nos librairies et plugins +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Certainns librairies et plugins actuellement utilisés sur le logiciel sont en snapshot, i.e sont suceptibles d'évoluer et ne sont pas stables, +on les remplace par des version releasées qui elles sont jages de stabilité et sont plus facilement traçables (des tags svn sont posés pour chaque nouvelle release). + +Migration de JAXX 1.0 +~~~~~~~~~~~~~~~~~~~~~ + +Un gros travail a été effectué sur la libraire JAXX http://buix.labs.libre-entreprise.org/jaxx, désormais l'exécution de l'application est bien détachée du code du compilateur JAXX, cela +a nécessité de repenser l'organisation des modules du projet JAXX et cela nécessite une moigration. + +Suppression du module simexplorer-si-swing-generated +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Le plugin Jaxx et Commandline sont désormais capable de générer du code lorsque cela est nécessaire, il n'est donc +plus nécessaire de conserver un module de génération et tout est générer dans le module swing. + + + +