- Simexplorer-si-commits - mailman.cloud.codelutin.com

r845 - trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org Feb. 11, 2008

Feb. 11, 2008

Author: tchemit Date: 2008-02-11 21:07:06 +0000 (Mon, 11 Feb 2008) New Revision: 845 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx Log: repositionnement css Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx 2008-02-11 21:04:44 UTC (rev 844) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx 2008-02-11 21:07:06 UTC (rev 845) @@ -1,5 +1,5 @@ <Table> - <style source="/../common.css"/> + <style source="common.css"/> <style> .border { border:{javax.swing.border.LineBorder.createBlackLineBorder()}; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx 2008-02-11 21:04:44 UTC (rev 844) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx 2008-02-11 21:07:06 UTC (rev 845) @@ -1,5 +1,5 @@ <Table> - <style source="/../common.css"/> + <style source="common.css"/> <script> import static org.codelutin.i18n.I18n._; </script> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx 2008-02-11 21:04:44 UTC (rev 844) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx 2008-02-11 21:07:06 UTC (rev 845) @@ -1,5 +1,5 @@ <Table> - <style source="/../common.css"/> + <style source="common.css"/> <style> .border { border:{javax.swing.border.LineBorder.createBlackLineBorder()};

1 0

r844 - trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org Feb. 11, 2008

Feb. 11, 2008

Author: tchemit Date: 2008-02-11 21:04:44 +0000 (Mon, 11 Feb 2008) New Revision: 844 Removed: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/ Log: suppression paquetage tab

1 0

r843 - in trunk/simexplorer-is/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing java/fr/cemagref/simexplorer/is/ui/swing/actions java/fr/cemagref/simexplorer/is/ui/swing/actions/util uimodel/fr/cemagref/simexplorer/is/ui/swing uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org Feb. 11, 2008

Feb. 11, 2008

Author: tchemit Date: 2008-02-11 21:03:59 +0000 (Mon, 11 Feb 2008) New Revision: 843 Added: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx Removed: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JDetailTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JListTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JSynchronizeTab.jaxx Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java Log: suppression paquetage tab Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-02-11 21:02:06 UTC (rev 842) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-02-11 21:03:59 UTC (rev 843) @@ -21,9 +21,9 @@ import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.SynchronizeTabModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JDetailTab; -import fr.cemagref.simexplorer.is.ui.swing.tab.JListTab; -import fr.cemagref.simexplorer.is.ui.swing.tab.JSynchronizeTab; +import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.JListTab; +import fr.cemagref.simexplorer.is.ui.swing.JSynchronizeTab; import jaxx.runtime.JAXXObject; import jaxx.runtime.builder.TabContentConfig; import jaxx.runtime.builder.TabFactory; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-11 21:02:06 UTC (rev 842) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-11 21:03:59 UTC (rev 843) @@ -31,8 +31,8 @@ import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JDetailTab; -import fr.cemagref.simexplorer.is.ui.swing.tab.JListTab; +import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.JListTab; import org.codelutin.i18n.CountryEnum; import static org.codelutin.i18n.I18n._; import org.codelutin.i18n.LanguageEnum; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-02-11 21:02:06 UTC (rev 842) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-02-11 21:03:59 UTC (rev 843) @@ -20,11 +20,11 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; +import fr.cemagref.simexplorer.is.ui.swing.JListTab; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JListTab; import javax.swing.AbstractAction; import javax.swing.AbstractButton; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2008-02-11 21:02:06 UTC (rev 842) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2008-02-11 21:03:59 UTC (rev 843) @@ -22,7 +22,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JListTab; +import fr.cemagref.simexplorer.is.ui.swing.JListTab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; import javax.swing.Action; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java 2008-02-11 21:02:06 UTC (rev 842) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java 2008-02-11 21:03:59 UTC (rev 843) @@ -21,7 +21,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; -import fr.cemagref.simexplorer.is.ui.swing.tab.JDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; import javax.swing.JTree; import java.awt.event.ActionEvent; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java 2008-02-11 21:02:06 UTC (rev 842) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java 2008-02-11 21:03:59 UTC (rev 843) @@ -21,7 +21,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; -import fr.cemagref.simexplorer.is.ui.swing.tab.JDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; import javax.swing.JTree; import java.awt.event.ActionEvent; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java 2008-02-11 21:02:06 UTC (rev 842) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java 2008-02-11 21:03:59 UTC (rev 843) @@ -23,7 +23,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; -import fr.cemagref.simexplorer.is.ui.swing.tab.JDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; import javax.swing.JTree; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-02-11 21:02:06 UTC (rev 842) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-02-11 21:03:59 UTC (rev 843) @@ -21,7 +21,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JListTab; +import fr.cemagref.simexplorer.is.ui.swing.JListTab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; import javax.swing.JTable; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-02-11 21:02:06 UTC (rev 842) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-02-11 21:03:59 UTC (rev 843) @@ -21,7 +21,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JListTab; +import fr.cemagref.simexplorer.is.ui.swing.JListTab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; import javax.swing.JTextField; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-11 21:02:06 UTC (rev 842) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-11 21:03:59 UTC (rev 843) @@ -23,11 +23,11 @@ import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; +import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; import fr.cemagref.simexplorer.is.ui.swing.actions.util.ShowTabAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; -import fr.cemagref.simexplorer.is.ui.swing.tab.JDetailTab; import javax.swing.DefaultComboBoxModel; import javax.swing.event.ListSelectionEvent; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-02-11 21:02:06 UTC (rev 842) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-02-11 21:03:59 UTC (rev 843) @@ -20,7 +20,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.ShowTabAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.SynchronizeTabModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JSynchronizeTab; +import fr.cemagref.simexplorer.is.ui.swing.JSynchronizeTab; import java.awt.event.ActionEvent; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-11 21:02:06 UTC (rev 842) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-11 21:03:59 UTC (rev 843) @@ -26,11 +26,11 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; +import fr.cemagref.simexplorer.is.ui.swing.JListTab; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.SynchronizeTabModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JListTab; import jaxx.runtime.JAXXObject; import javax.swing.AbstractAction; Copied: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx (from rev 842, trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JDetailTab.jaxx) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx 2008-02-11 21:03:59 UTC (rev 843) @@ -0,0 +1,151 @@ +<Table> + <style source="/../common.css"/> + <style> + .border { + border:{javax.swing.border.LineBorder.createBlackLineBorder()}; + height:28; + } + </style> + <script> + import static org.codelutin.i18n.I18n._; + </script> + <row> + <cell fill='horizontal'> + <Table id='toolbarNavigation' styleClass='border' insets='0,0,0,0'> + <row> + <cell weightx="1" fill='horizontal'> + <JPanel opaque='false' > + <JLabel id='navigationHeader' text='{_("simexplorer.node.navigation")}'/> + </JPanel> + </cell> + <cell anchor="east"> + <JToolBar> + <JButton id='collapseAll'/> + <JButton id='expandAll'/> + </JToolBar> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell> + <Table id='toolbarDetail' styleClass='border' background='{Color.WHITE}' insets='0,0,0,0'> + <row> + <cell weightx="1" fill='horizontal'> + <JPanel opaque='false' > + <JLabel id='detailHeader' opaque='false' /> + </JPanel> + </cell> + <cell anchor="east"> + <JToolBar> + <JButton id='synchronizeElement'/> + <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.4" oneTouchExpandable='true'> + <JScrollPane columnHeaderView='{toolbarNavigation}'> + <JTree id="navigationTree" model='{new javax.swing.tree.DefaultTreeModel(null)}'/> + </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.name")}'/> + </cell> + <cell weightx="1" anchor='west'> + <JLabel id='detailName'/> + </cell> + </row> + <row fill='vertical'> + <cell anchor='west'> + <JLabel text='{_("simexplorer.common.type")}'/> + </cell> + <cell weightx="1" anchor='west'> + <JLabel id='detailType'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text='{_("simexplorer.common.version")}'/> + </cell> + <cell weightx="1" anchor='west'> + <JComboBox id='detailVersions' model='{new DefaultComboBoxModel()}'/> + </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='5,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}' model='{new fr.cemagref.simexplorer.is.ui.swing.model.JDetailTableModel()}' focusable='false' enabled='false' /> + </JScrollPane> + </cell> + </row> + <row> + <cell fill="horizontal" columns="2" insets='5,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> +</Table> Copied: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx (from rev 842, trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JListTab.jaxx) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JListTab.jaxx 2008-02-11 21:03:59 UTC (rev 843) @@ -0,0 +1,55 @@ +<Table> + <style source="/../common.css"/> + <script> + import static org.codelutin.i18n.I18n._; + </script> +  + <row> + <cell fill='horizontal' insets='0,0,0,0'> + <JPopupMenu id="tablePopupMenu" invoker='{table}' enabled='false'> + <JMenuItem id='synchronizeElement'/> + <JMenuItem id='exportElement'/> + <JMenuItem id='downloadElement'/> + <JMenuItem id='deleteElement'/> + </JPopupMenu> + <JToolBar> + <JButton id='importElement'/> + <JTextField id='searchText' toolTipText='{_("simexplorer.action.searchText.tooltip")}'/> + <JButton id='search'/> + <JButton id='resetSearch'/> + <JButton id='advancedSearch'/> + <JComboBox id='changeSizor' enabled='false' font-size='9' opaque='false' preferredSize='{new Dimension(50,5)}'> + <item value='5'/> + <item value='10'/> + <item value='20'/> + <item value='50'/> + <item value='100'/> + <item value='200'/> + <item value='500'/> + </JComboBox> + </JToolBar> + </cell> + </row> + <row fill='both' weightx='1' weighty='1'> + <cell insets='0,0,0,0'> + <JScrollPane> + <JTable id='table' model='{new fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel()}'/> + </JScrollPane> + </cell> + </row> +  + <row> + <cell anchor='center' insets='0,0,0,0'> + <JToolBar> + <JButton id='goFirstPage' enabled='{goPage.getSelectedIndex()>0}'/> + <JButton id='goPreviousPage' enabled='{goPage.getSelectedIndex()>0}'/> + <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> +</Table> Copied: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx (from rev 842, trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JSynchronizeTab.jaxx) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JSynchronizeTab.jaxx 2008-02-11 21:03:59 UTC (rev 843) @@ -0,0 +1,68 @@ +<Table> + <style source="/../common.css"/> + <style> + .border { + border:{javax.swing.border.LineBorder.createBlackLineBorder()}; + height:28; + } + </style> + <script> + import static org.codelutin.i18n.I18n._; + </script> + <row> + <cell> + <Table id='toolbarNavigationLocal' styleClass='border' insets='0,0,0,0'> + <row> + <cell weightx="1" fill='horizontal'> + <JPanel opaque='false' > + <JLabel id='navigationHeaderLocal' text='{_("simexplorer.node.navigation")}'/> + </JPanel> + </cell> + <cell anchor="east"> + <JToolBar> + <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 weightx="1" fill='horizontal'> + <JPanel opaque='false' > + <JLabel id='navigationHeaderRemote' text='{_("simexplorer.node.navigation")}'/> + </JPanel> + </cell> + <cell anchor="east"> + <JToolBar> + <JButton id='collapseAllRemote'/> + <JButton id='expandAllRemote'/> + </JToolBar> + </cell> + </row> + </Table> + </cell> + </row> + <row fill="both" weightx="1" weighty="1"> + <cell insets='0,0,0,0'> + <JScrollPane columnHeaderView='{toolbarNavigationLocal}'> + <JTree id='contentTreeLocal' model='{new javax.swing.tree.DefaultTreeModel(null)}'/> + </JScrollPane> + </cell> + <cell fill='vertical' insets='0,0,0,0'> + <JToolBar> + <JButton id='exportElementToRemote'/> + <JButton id='exportElementToLocale'/> + </JToolBar> + </cell> + <cell insets='0,0,0,0' weightx="1" weighty="1"> + <JScrollPane columnHeaderView='{toolbarNavigationRemote}'> + <JTree id='contentTreeRemote' model='{new javax.swing.tree.DefaultTreeModel(null)}'/> + </JScrollPane> + </cell> + </row> +</Table> Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JDetailTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JDetailTab.jaxx 2008-02-11 21:02:06 UTC (rev 842) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JDetailTab.jaxx 2008-02-11 21:03:59 UTC (rev 843) @@ -1,151 +0,0 @@ -<Table> - <style source="/../common.css"/> - <style> - .border { - border:{javax.swing.border.LineBorder.createBlackLineBorder()}; - height:28; - } - </style> - <script> - import static org.codelutin.i18n.I18n._; - </script> - <row> - <cell fill='horizontal'> - <Table id='toolbarNavigation' styleClass='border' insets='0,0,0,0'> - <row> - <cell weightx="1" fill='horizontal'> - <JPanel opaque='false' > - <JLabel id='navigationHeader' text='{_("simexplorer.node.navigation")}'/> - </JPanel> - </cell> - <cell anchor="east"> - <JToolBar> - <JButton id='collapseAll'/> - <JButton id='expandAll'/> - </JToolBar> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell> - <Table id='toolbarDetail' styleClass='border' background='{Color.WHITE}' insets='0,0,0,0'> - <row> - <cell weightx="1" fill='horizontal'> - <JPanel opaque='false' > - <JLabel id='detailHeader' opaque='false' /> - </JPanel> - </cell> - <cell anchor="east"> - <JToolBar> - <JButton id='synchronizeElement'/> - <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.4" oneTouchExpandable='true'> - <JScrollPane columnHeaderView='{toolbarNavigation}'> - <JTree id="navigationTree" model='{new javax.swing.tree.DefaultTreeModel(null)}'/> - </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.name")}'/> - </cell> - <cell weightx="1" anchor='west'> - <JLabel id='detailName'/> - </cell> - </row> - <row fill='vertical'> - <cell anchor='west'> - <JLabel text='{_("simexplorer.common.type")}'/> - </cell> - <cell weightx="1" anchor='west'> - <JLabel id='detailType'/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel text='{_("simexplorer.common.version")}'/> - </cell> - <cell weightx="1" anchor='west'> - <JComboBox id='detailVersions' model='{new DefaultComboBoxModel()}'/> - </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='5,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}' model='{new fr.cemagref.simexplorer.is.ui.swing.model.JDetailTableModel()}' focusable='false' enabled='false' /> - </JScrollPane> - </cell> - </row> - <row> - <cell fill="horizontal" columns="2" insets='5,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> -</Table> Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JListTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JListTab.jaxx 2008-02-11 21:02:06 UTC (rev 842) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JListTab.jaxx 2008-02-11 21:03:59 UTC (rev 843) @@ -1,55 +0,0 @@ -<Table> - <style source="/../common.css"/> - <script> - import static org.codelutin.i18n.I18n._; - </script> -  - <row> - <cell fill='horizontal' insets='0,0,0,0'> - <JPopupMenu id="tablePopupMenu" invoker='{table}' enabled='false'> - <JMenuItem id='synchronizeElement'/> - <JMenuItem id='exportElement'/> - <JMenuItem id='downloadElement'/> - <JMenuItem id='deleteElement'/> - </JPopupMenu> - <JToolBar> - <JButton id='importElement'/> - <JTextField id='searchText' toolTipText='{_("simexplorer.action.searchText.tooltip")}'/> - <JButton id='search'/> - <JButton id='resetSearch'/> - <JButton id='advancedSearch'/> - <JComboBox id='changeSizor' enabled='false' font-size='9' opaque='false' preferredSize='{new Dimension(50,5)}'> - <item value='5'/> - <item value='10'/> - <item value='20'/> - <item value='50'/> - <item value='100'/> - <item value='200'/> - <item value='500'/> - </JComboBox> - </JToolBar> - </cell> - </row> - <row fill='both' weightx='1' weighty='1'> - <cell insets='0,0,0,0'> - <JScrollPane> - <JTable id='table' model='{new fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel()}'/> - </JScrollPane> - </cell> - </row> -  - <row> - <cell anchor='center' insets='0,0,0,0'> - <JToolBar> - <JButton id='goFirstPage' enabled='{goPage.getSelectedIndex()>0}'/> - <JButton id='goPreviousPage' enabled='{goPage.getSelectedIndex()>0}'/> - <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> -</Table> Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JSynchronizeTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JSynchronizeTab.jaxx 2008-02-11 21:02:06 UTC (rev 842) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JSynchronizeTab.jaxx 2008-02-11 21:03:59 UTC (rev 843) @@ -1,68 +0,0 @@ -<Table> - <style source="/../common.css"/> - <style> - .border { - border:{javax.swing.border.LineBorder.createBlackLineBorder()}; - height:28; - } - </style> - <script> - import static org.codelutin.i18n.I18n._; - </script> - <row> - <cell> - <Table id='toolbarNavigationLocal' styleClass='border' insets='0,0,0,0'> - <row> - <cell weightx="1" fill='horizontal'> - <JPanel opaque='false' > - <JLabel id='navigationHeaderLocal' text='{_("simexplorer.node.navigation")}'/> - </JPanel> - </cell> - <cell anchor="east"> - <JToolBar> - <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 weightx="1" fill='horizontal'> - <JPanel opaque='false' > - <JLabel id='navigationHeaderRemote' text='{_("simexplorer.node.navigation")}'/> - </JPanel> - </cell> - <cell anchor="east"> - <JToolBar> - <JButton id='collapseAllRemote'/> - <JButton id='expandAllRemote'/> - </JToolBar> - </cell> - </row> - </Table> - </cell> - </row> - <row fill="both" weightx="1" weighty="1"> - <cell insets='0,0,0,0'> - <JScrollPane columnHeaderView='{toolbarNavigationLocal}'> - <JTree id='contentTreeLocal' model='{new javax.swing.tree.DefaultTreeModel(null)}'/> - </JScrollPane> - </cell> - <cell fill='vertical' insets='0,0,0,0'> - <JToolBar> - <JButton id='exportElementToRemote'/> - <JButton id='exportElementToLocale'/> - </JToolBar> - </cell> - <cell insets='0,0,0,0' weightx="1" weighty="1"> - <JScrollPane columnHeaderView='{toolbarNavigationRemote}'> - <JTree id='contentTreeRemote' model='{new javax.swing.tree.DefaultTreeModel(null)}'/> - </JScrollPane> - </cell> - </row> -</Table>

1 0

r842 - in trunk/simexplorer-is/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing java/fr/cemagref/simexplorer/is/ui/swing/actions java/fr/cemagref/simexplorer/is/ui/swing/actions/util uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org Feb. 11, 2008

Feb. 11, 2008

Author: tchemit Date: 2008-02-11 21:02:06 +0000 (Mon, 11 Feb 2008) New Revision: 842 Added: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JDetailTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JListTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JSynchronizeTab.jaxx Removed: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java Log: simplification nom des tabs (le Application est inutile) Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-02-11 21:02:06 UTC (rev 842) @@ -21,9 +21,9 @@ import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.SynchronizeTabModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationSynchronizeTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JListTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JSynchronizeTab; import jaxx.runtime.JAXXObject; import jaxx.runtime.builder.TabContentConfig; import jaxx.runtime.builder.TabFactory; @@ -37,7 +37,7 @@ public enum SimExplorerTab { @TabContentConfig( - impl = JApplicationDetailTab.class, + impl = JDetailTab.class, model = DetailTabModel.class, parentImpl = JTabbedPane.class, name = "simexplorer.tab.detail", @@ -45,7 +45,7 @@ )detail, @TabContentConfig( - impl = JApplicationListTab.class, + impl = JListTab.class, parentImpl = JTabbedPane.class, model = ListTabModel.class, useToogle = true, @@ -54,7 +54,7 @@ )local, @TabContentConfig( - impl = JApplicationListTab.class, + impl = JListTab.class, parentImpl = JTabbedPane.class, model = ListTabModel.class, useToogle = true, @@ -63,7 +63,7 @@ )remote, @TabContentConfig( - impl = JApplicationSynchronizeTab.class, + impl = JSynchronizeTab.class, parentImpl = JTabbedPane.class, model = SynchronizeTabModel.class, useToogle = false, Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-11 21:02:06 UTC (rev 842) @@ -31,8 +31,8 @@ import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JListTab; import org.codelutin.i18n.CountryEnum; import static org.codelutin.i18n.I18n._; import org.codelutin.i18n.LanguageEnum; @@ -77,7 +77,7 @@ * @param ui l'onglet de liste à utiliser * @param model le modèle de liste à utiliser */ - public static void refreshListTabUI(final JApplicationListTab ui, final ListTabModel model) { + public static void refreshListTabUI(final JListTab ui, final ListTabModel model) { SwingUtilities.invokeLater(new Runnable() { public void run() { @@ -106,7 +106,7 @@ }); } - public static void refreshListTablePopupMenu(final JApplicationListTab ui,final ListTabModel model) { + public static void refreshListTablePopupMenu(final JListTab ui,final ListTabModel model) { int index = model.getSelectedIndex(); if (index ==-1) { // disable popupmenu @@ -161,7 +161,7 @@ * @param ui l'onglet de liste à utiliser * @param model le modèle de liste à utiliser */ - public static void refreshSearchActions(JApplicationListTab ui, ListTabModel model) { + public static void refreshSearchActions(JListTab ui, ListTabModel model) { String text = ui.getSearchText().getText(); ui.getSearch().setEnabled(model.hasQuery() || !text.isEmpty()); ui.getResetSearch().setEnabled(model.hasQuery() || !text.isEmpty()); @@ -217,7 +217,7 @@ * @param model le model de d'onglet detail * @param node le node sélectionné dans l'arbre de navigation */ - public static void refreshDetailActions(JApplicationDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { + public static void refreshDetailActions(JDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { // refresh synchronize action button refreshSynchroniseElementAction(ui, model); // refresh download LoggableElement button @@ -232,7 +232,7 @@ refreshTreeActions(ui, node); } - protected static void refreshTreeActions(JApplicationDetailTab ui, LoggableElementTreeNode node) { + protected static void refreshTreeActions(JDetailTab ui, LoggableElementTreeNode node) { String tooltip; boolean enabled = node != null && !node.isLeaf() && node.getChildCount() > 0; @@ -242,21 +242,21 @@ updateButton(ui.getExpandAll(), enabled, tooltip); } - protected static void refreshDownloadElementAction(JApplicationDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { + protected static void refreshDownloadElementAction(JDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { MetaData detail = model.getDetail(); boolean enabled = detail != null || LoggableElementTreeHelper.canDownload(node); String tooltip = !enabled ? null : _("simexplorer.action.downloadLoggableElement.tooltip", detail == null ? node.getUserObject() : detail.getName() + " - " + model.getSelectedVersion()); updateButton(ui.getDownloadElement(), enabled, tooltip); } - protected static void refreshDeleteElementAction(JApplicationDetailTab ui, DetailTabModel model) { + protected static void refreshDeleteElementAction(JDetailTab ui, DetailTabModel model) { MetaData detail = model.getDetail(); boolean enabled = detail != null; String tooltip = !enabled ? null : _("simexplorer.action.deleteLoggableElement.tooltip", detail.getName() + " - " + model.getSelectedVersion()); updateButton(ui.getDeleteElement(), enabled, tooltip); } - public static void refreshDownloadAttachmentAction(JApplicationDetailTab ui, DetailTabModel model) { + public static void refreshDownloadAttachmentAction(JDetailTab ui, DetailTabModel model) { Attachment attachment = model.getSelectedAttachment(); MetaData detail = model.getDetail(); boolean enabled = detail != null && attachment != null; @@ -264,14 +264,14 @@ updateButton(ui.getDownloadAttachment(), enabled, tooltip); } - public static void refreshSynchroniseElementAction(JApplicationDetailTab ui, DetailTabModel model) { + public static void refreshSynchroniseElementAction(JDetailTab ui, DetailTabModel model) { MetaData detail = model.getDetail(); boolean enabled = detail != null; String tooltip = !enabled ? null : _("simexplorer.action.synchronize.tooltip", detail.getName() + " - " + model.getSelectedVersion()); updateButton(ui.getLaunchSynchronize(), enabled, tooltip); } - protected static void refreshExportAction(JApplicationDetailTab ui, DetailTabModel model) { + protected static void refreshExportAction(JDetailTab ui, DetailTabModel model) { MetaData detail = model.getDetail(); LoggableElement sNode = model.getSelectedNode(); boolean enabled = sNode != null && sNode instanceof ExplorationApplication; @@ -279,14 +279,14 @@ updateButton(ui.getExportElement(), enabled, tooltip); } - protected static void refreshPagination(JApplicationListTab ui, PaginationModel pagination) { + protected static void refreshPagination(JListTab ui, PaginationModel pagination) { int page = pagination.getCurrentPage(); boolean notLast = page + 1 < pagination.getNbPages(); ui.getGoNextPage().setEnabled(notLast); ui.getGoLastPage().setEnabled(notLast); } - protected static void refreshChangeSizorCombo(JApplicationListTab ui, ListTabModel model) { + protected static void refreshChangeSizorCombo(JListTab ui, ListTabModel model) { JComboBox combo = ui.getChangeSizor(); String s = model.getPagination().getWidth() + ""; if (!s.equals(String.valueOf(combo.getSelectedItem()))) { @@ -296,7 +296,7 @@ } } - protected static void refreshChangePageCombo(JApplicationListTab ui, ListTabModel model) { + protected static void refreshChangePageCombo(JListTab ui, ListTabModel model) { JComboBox combo = ui.getGoPage(); long size = model.getPagination().getNbPages(); combo.setEnabled(false); @@ -323,7 +323,7 @@ button.setToolTipText(tooltip); } - public static void resetHistory(JApplicationDetailTab ui, DetailTabModel model, DefaultComboBoxModel historyModel) { + public static void resetHistory(JDetailTab ui, DetailTabModel model, DefaultComboBoxModel historyModel) { historyModel.removeAllElements(); LoggableElement selectedNode = model.getSelectedNode(); Version[] versions = model.getVersions(); @@ -347,7 +347,7 @@ } } - public static void resetDetailPanel(final JApplicationDetailTab ui) { + public static void resetDetailPanel(final JDetailTab ui) { ui.getDetailHeader().setText(_("simexplorer.node.nodetail")); ui.getDetailAttachmentsHeader().setText(_("simexplorer.node.noattachments")); JList listAttchments = ui.getDetailAttachments(); @@ -359,7 +359,7 @@ ((JDetailTableModel) ui.getDetailTable().getModel()).setData(null); } - public static void updateDetailPanel(Integer index, final JApplicationDetailTab ui, DetailTabModel model, LoggableElement selectedNode) { + public static void updateDetailPanel(Integer index, final JDetailTab ui, DetailTabModel model, LoggableElement selectedNode) { MetaData detail = model.getDetail(); ui.getDetailVersions().setSelectedIndex(index); ui.getDetailHeader().setText(_("simexplorer.node.detail", selectedNode.getMetaData().getName(), model.getSelectedVersion())); @@ -454,7 +454,7 @@ throw new IllegalStateException("can not come her :)"); } - public static void updateDetailNavigationTree(JApplicationDetailTab ui, DetailTabModel model) { + public static void updateDetailNavigationTree(JDetailTab ui, DetailTabModel model) { // create navigation tree TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getRootNode()); // push it in tree model Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-02-11 21:02:06 UTC (rev 842) @@ -24,7 +24,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JListTab; import javax.swing.AbstractAction; import javax.swing.AbstractButton; @@ -86,7 +86,7 @@ model.updateTabModel(isRemote(), getContext()); // update table model - JApplicationListTab container = (JApplicationListTab) getUI(); + JListTab container = (JListTab) getUI(); JTable table = container.getTable(); JApplicationTableModel modelTab = (JApplicationTableModel) table.getModel(); modelTab.setData(model.getList()); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2008-02-11 21:02:06 UTC (rev 842) @@ -22,7 +22,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JListTab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; import javax.swing.Action; @@ -83,7 +83,7 @@ // save in TableModel - JApplicationListTab container = (JApplicationListTab) getUI(); + JListTab container = (JListTab) getUI(); JTable jApplicationTable = container.getTable(); JApplicationTableModel modelTab = (JApplicationTableModel) jApplicationTable.getModel(); modelTab.setData(model.getList()); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java 2008-02-11 21:02:06 UTC (rev 842) @@ -21,7 +21,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JDetailTab; import javax.swing.JTree; import java.awt.event.ActionEvent; @@ -55,7 +55,7 @@ if (!super.beforeAction(e)) { return false; } - JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + JDetailTab ui = (JDetailTab) getUI(); tree = ui.getNavigationTree(); node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); boolean result; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java 2008-02-11 21:02:06 UTC (rev 842) @@ -18,18 +18,9 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.actions.util.DeleteAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; -import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; -import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; -import javax.swing.JTree; import java.awt.event.ActionEvent; -import java.io.File; /** * Action pour downloader un résultat ou une librairie Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java 2008-02-11 21:02:06 UTC (rev 842) @@ -21,7 +21,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JDetailTab; import javax.swing.JTree; import java.awt.event.ActionEvent; @@ -55,7 +55,7 @@ if (!super.beforeAction(e)) { return false; } - JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + JDetailTab ui = (JDetailTab) getUI(); tree = ui.getNavigationTree(); node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); boolean result; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java 2008-02-11 21:02:06 UTC (rev 842) @@ -23,7 +23,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JDetailTab; import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; import javax.swing.JTree; @@ -64,7 +64,7 @@ if (!super.beforeAction(e)) { return false; } - JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + JDetailTab ui = (JDetailTab) getUI(); tree = ui.getNavigationTree(); node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); boolean result; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-02-11 21:02:06 UTC (rev 842) @@ -21,7 +21,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JListTab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; import javax.swing.JTable; @@ -53,7 +53,7 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { ListTabModel model = (ListTabModel) getModel(); - JApplicationListTab ui = (JApplicationListTab) getUI(); + JListTab ui = (JListTab) getUI(); // always clean the input text (should be done in jaxx) ui.getSearchText().setText(null); if (!model.hasQuery()) { @@ -81,7 +81,7 @@ model.updateTabModel(isRemote(), getContext()); // update table model in ui - JApplicationListTab container = (JApplicationListTab) getUI(); + JListTab container = (JListTab) getUI(); JTable table = container.getTable(); JApplicationTableModel modelTab = (JApplicationTableModel) table.getModel(); modelTab.setData(model.getList()); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-02-11 21:02:06 UTC (rev 842) @@ -21,7 +21,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JListTab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; import javax.swing.JTextField; @@ -73,7 +73,7 @@ model.updateTabModel(isRemote(), getContext()); // update table model in ui - JApplicationListTab container = (JApplicationListTab) getUI(); + JListTab container = (JListTab) getUI(); JTable table = container.getTable(); JApplicationTableModel modelTab = (JApplicationTableModel) table.getModel(); modelTab.setData(model.getList()); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-11 21:02:06 UTC (rev 842) @@ -27,7 +27,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JDetailTab; import javax.swing.DefaultComboBoxModel; import javax.swing.event.ListSelectionEvent; @@ -58,7 +58,7 @@ mnemonic = 'd', hideActionText = false ) -public class ShowDetailTabAction extends ShowTabAbstractAction<JApplicationDetailTab, DetailTabModel> { +public class ShowDetailTabAction extends ShowTabAbstractAction<JDetailTab, DetailTabModel> { private static final long serialVersionUID = 6643631041114311643L; @@ -75,7 +75,7 @@ attachmentListener = new AttachmentSelectionListener(); } - protected void initFirstUsage(final JApplicationDetailTab ui, final DetailTabModel model) { + protected void initFirstUsage(final JDetailTab ui, final DetailTabModel model) { // add a listener on navigation tree ui.getNavigationTree().addTreeSelectionListener(navigationListener); // add a listener on versions list @@ -84,7 +84,7 @@ ui.getDetailAttachments().addListSelectionListener(attachmentListener); } - protected void initUI(JApplicationDetailTab ui, DetailTabModel model) { + protected void initUI(JDetailTab ui, DetailTabModel model) { SimExplorerUIRefreshHelper.updateDetailNavigationTree(ui, model); } @@ -154,7 +154,7 @@ */ public void propertyChange(PropertyChangeEvent evt) { log.debug(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); - JApplicationDetailTab ui = getTabUI(); + JDetailTab ui = getTabUI(); DetailTabModel model = getTabModel(); DefaultComboBoxModel historyModel = (DefaultComboBoxModel) ui.getDetailVersions().getModel(); @@ -188,7 +188,7 @@ if (!isEnabled()) { return; } - JApplicationDetailTab ui = getTabUI(); + JDetailTab ui = getTabUI(); DetailTabModel model = getTabModel(); MetaData metas; @@ -228,7 +228,7 @@ public void propertyChange(PropertyChangeEvent evt) { log.debug(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); Integer index = (Integer) evt.getNewValue(); - JApplicationDetailTab ui = getTabUI(); + JDetailTab ui = getTabUI(); DetailTabModel model = getTabModel(); LoggableElement selectedNode = model.getSelectedNode(); boolean wasEnable = isEnabled(); @@ -275,7 +275,7 @@ if (!isEnabled()) { return; } - JApplicationDetailTab ui = getTabUI(); + JDetailTab ui = getTabUI(); DetailTabModel model = getTabModel(); Object selectedItem = ui.getDetailAttachments().getSelectedValue(); if (selectedItem == null) { @@ -297,7 +297,7 @@ */ public void propertyChange(PropertyChangeEvent evt) { log.debug(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); - JApplicationDetailTab ui = getTabUI(); + JDetailTab ui = getTabUI(); DetailTabModel model = getTabModel(); boolean wasEnable = isEnabled(); // disable this listener, while updating list model, it will Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-02-11 21:02:06 UTC (rev 842) @@ -20,7 +20,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.ShowTabAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.SynchronizeTabModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationSynchronizeTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JSynchronizeTab; import java.awt.event.ActionEvent; @@ -38,7 +38,7 @@ mnemonic = 'S', hideActionText = false ) -public class ShowSynchronizeTabAction extends ShowTabAbstractAction<JApplicationSynchronizeTab, SynchronizeTabModel> { +public class ShowSynchronizeTabAction extends ShowTabAbstractAction<JSynchronizeTab, SynchronizeTabModel> { private static final long serialVersionUID = -3901398502496915785L; public ShowSynchronizeTabAction(String name) { @@ -51,11 +51,11 @@ return super.beforeAction(e); } - protected void initFirstUsage(JApplicationSynchronizeTab ui, SynchronizeTabModel model) { + protected void initFirstUsage(JSynchronizeTab ui, SynchronizeTabModel model) { //TODO } - protected void initUI(JApplicationSynchronizeTab ui, SynchronizeTabModel model) { + protected void initUI(JSynchronizeTab ui, SynchronizeTabModel model) { //TODO } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-11 21:02:06 UTC (rev 842) @@ -30,7 +30,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.SynchronizeTabModel; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; +import fr.cemagref.simexplorer.is.ui.swing.tab.JListTab; import jaxx.runtime.JAXXObject; import javax.swing.AbstractAction; @@ -46,7 +46,7 @@ import java.awt.event.MouseEvent; /** @author chemit */ -public class ShowListTabAbstractAction extends ShowTabAbstractAction<JApplicationListTab, ListTabModel> { +public class ShowListTabAbstractAction extends ShowTabAbstractAction<JListTab, ListTabModel> { private static final long serialVersionUID = 3813479850648257169L; /** flag pour indiquer si la liste est locale ou remote */ @@ -80,7 +80,7 @@ return true; } - protected void initFirstUsage(final JApplicationListTab ui, final ListTabModel model) { + protected void initFirstUsage(final JListTab ui, final ListTabModel model) { ui.getLaunchSynchronize().setHideActionText(false); ui.getExportElement().setHideActionText(false); ui.getDownloadElement().setHideActionText(false); @@ -165,7 +165,7 @@ modelTab.setData(model.getList()); } - protected void initUI(JApplicationListTab ui, ListTabModel model) { + protected void initUI(JListTab ui, ListTabModel model) { SimExplorerUIRefreshHelper.refreshListTabUI(ui, model); } } Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-11 21:02:06 UTC (rev 842) @@ -1,151 +0,0 @@ -<Table> - <style source="/../common.css"/> - <style> - .border { - border:{javax.swing.border.LineBorder.createBlackLineBorder()}; - height:28; - } - </style> - <script> - import static org.codelutin.i18n.I18n._; - </script> - <row> - <cell fill='horizontal'> - <Table id='toolbarNavigation' styleClass='border' insets='0,0,0,0'> - <row> - <cell weightx="1" fill='horizontal'> - <JPanel opaque='false' > - <JLabel id='navigationHeader' text='{_("simexplorer.node.navigation")}'/> - </JPanel> - </cell> - <cell anchor="east"> - <JToolBar> - <JButton id='collapseAll'/> - <JButton id='expandAll'/> - </JToolBar> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell> - <Table id='toolbarDetail' styleClass='border' background='{Color.WHITE}' insets='0,0,0,0'> - <row> - <cell weightx="1" fill='horizontal'> - <JPanel opaque='false' > - <JLabel id='detailHeader' opaque='false' /> - </JPanel> - </cell> - <cell anchor="east"> - <JToolBar> - <JButton id='synchronizeElement'/> - <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.4" oneTouchExpandable='true'> - <JScrollPane columnHeaderView='{toolbarNavigation}'> - <JTree id="navigationTree" model='{new javax.swing.tree.DefaultTreeModel(null)}'/> - </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.name")}'/> - </cell> - <cell weightx="1" anchor='west'> - <JLabel id='detailName'/> - </cell> - </row> - <row fill='vertical'> - <cell anchor='west'> - <JLabel text='{_("simexplorer.common.type")}'/> - </cell> - <cell weightx="1" anchor='west'> - <JLabel id='detailType'/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel text='{_("simexplorer.common.version")}'/> - </cell> - <cell weightx="1" anchor='west'> - <JComboBox id='detailVersions' model='{new DefaultComboBoxModel()}'/> - </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='5,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}' model='{new fr.cemagref.simexplorer.is.ui.swing.model.JDetailTableModel()}' focusable='false' enabled='false' /> - </JScrollPane> - </cell> - </row> - <row> - <cell fill="horizontal" columns="2" insets='5,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> -</Table> Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-02-11 21:02:06 UTC (rev 842) @@ -1,55 +0,0 @@ -<Table> - <style source="/../common.css"/> - <script> - import static org.codelutin.i18n.I18n._; - </script> -  - <row> - <cell fill='horizontal' insets='0,0,0,0'> - <JPopupMenu id="tablePopupMenu" invoker='{table}' enabled='false'> - <JMenuItem id='synchronizeElement'/> - <JMenuItem id='exportElement'/> - <JMenuItem id='downloadElement'/> - <JMenuItem id='deleteElement'/> - </JPopupMenu> - <JToolBar> - <JButton id='importElement'/> - <JTextField id='searchText' toolTipText='{_("simexplorer.action.searchText.tooltip")}'/> - <JButton id='search'/> - <JButton id='resetSearch'/> - <JButton id='advancedSearch'/> - <JComboBox id='changeSizor' enabled='false' font-size='9' opaque='false' preferredSize='{new Dimension(50,5)}'> - <item value='5'/> - <item value='10'/> - <item value='20'/> - <item value='50'/> - <item value='100'/> - <item value='200'/> - <item value='500'/> - </JComboBox> - </JToolBar> - </cell> - </row> - <row fill='both' weightx='1' weighty='1'> - <cell insets='0,0,0,0'> - <JScrollPane> - <JTable id='table' model='{new fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel()}'/> - </JScrollPane> - </cell> - </row> -  - <row> - <cell anchor='center' insets='0,0,0,0'> - <JToolBar> - <JButton id='goFirstPage' enabled='{goPage.getSelectedIndex()>0}'/> - <JButton id='goPreviousPage' enabled='{goPage.getSelectedIndex()>0}'/> - <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> -</Table> Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx 2008-02-11 20:57:43 UTC (rev 841) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx 2008-02-11 21:02:06 UTC (rev 842) @@ -1,68 +0,0 @@ -<Table> - <style source="/../common.css"/> - <style> - .border { - border:{javax.swing.border.LineBorder.createBlackLineBorder()}; - height:28; - } - </style> - <script> - import static org.codelutin.i18n.I18n._; - </script> - <row> - <cell> - <Table id='toolbarNavigationLocal' styleClass='border' insets='0,0,0,0'> - <row> - <cell weightx="1" fill='horizontal'> - <JPanel opaque='false' > - <JLabel id='navigationHeaderLocal' text='{_("simexplorer.node.navigation")}'/> - </JPanel> - </cell> - <cell anchor="east"> - <JToolBar> - <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 weightx="1" fill='horizontal'> - <JPanel opaque='false' > - <JLabel id='navigationHeaderRemote' text='{_("simexplorer.node.navigation")}'/> - </JPanel> - </cell> - <cell anchor="east"> - <JToolBar> - <JButton id='collapseAllRemote'/> - <JButton id='expandAllRemote'/> - </JToolBar> - </cell> - </row> - </Table> - </cell> - </row> - <row fill="both" weightx="1" weighty="1"> - <cell insets='0,0,0,0'> - <JScrollPane columnHeaderView='{toolbarNavigationLocal}'> - <JTree id='contentTreeLocal' model='{new javax.swing.tree.DefaultTreeModel(null)}'/> - </JScrollPane> - </cell> - <cell fill='vertical' insets='0,0,0,0'> - <JToolBar> - <JButton id='exportElementToRemote'/> - <JButton id='exportElementToLocale'/> - </JToolBar> - </cell> - <cell insets='0,0,0,0' weightx="1" weighty="1"> - <JScrollPane columnHeaderView='{toolbarNavigationRemote}'> - <JTree id='contentTreeRemote' model='{new javax.swing.tree.DefaultTreeModel(null)}'/> - </JScrollPane> - </cell> - </row> -</Table> Copied: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JDetailTab.jaxx (from rev 840, trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JDetailTab.jaxx (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JDetailTab.jaxx 2008-02-11 21:02:06 UTC (rev 842) @@ -0,0 +1,151 @@ +<Table> + <style source="/../common.css"/> + <style> + .border { + border:{javax.swing.border.LineBorder.createBlackLineBorder()}; + height:28; + } + </style> + <script> + import static org.codelutin.i18n.I18n._; + </script> + <row> + <cell fill='horizontal'> + <Table id='toolbarNavigation' styleClass='border' insets='0,0,0,0'> + <row> + <cell weightx="1" fill='horizontal'> + <JPanel opaque='false' > + <JLabel id='navigationHeader' text='{_("simexplorer.node.navigation")}'/> + </JPanel> + </cell> + <cell anchor="east"> + <JToolBar> + <JButton id='collapseAll'/> + <JButton id='expandAll'/> + </JToolBar> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell> + <Table id='toolbarDetail' styleClass='border' background='{Color.WHITE}' insets='0,0,0,0'> + <row> + <cell weightx="1" fill='horizontal'> + <JPanel opaque='false' > + <JLabel id='detailHeader' opaque='false' /> + </JPanel> + </cell> + <cell anchor="east"> + <JToolBar> + <JButton id='synchronizeElement'/> + <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.4" oneTouchExpandable='true'> + <JScrollPane columnHeaderView='{toolbarNavigation}'> + <JTree id="navigationTree" model='{new javax.swing.tree.DefaultTreeModel(null)}'/> + </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.name")}'/> + </cell> + <cell weightx="1" anchor='west'> + <JLabel id='detailName'/> + </cell> + </row> + <row fill='vertical'> + <cell anchor='west'> + <JLabel text='{_("simexplorer.common.type")}'/> + </cell> + <cell weightx="1" anchor='west'> + <JLabel id='detailType'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text='{_("simexplorer.common.version")}'/> + </cell> + <cell weightx="1" anchor='west'> + <JComboBox id='detailVersions' model='{new DefaultComboBoxModel()}'/> + </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='5,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}' model='{new fr.cemagref.simexplorer.is.ui.swing.model.JDetailTableModel()}' focusable='false' enabled='false' /> + </JScrollPane> + </cell> + </row> + <row> + <cell fill="horizontal" columns="2" insets='5,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> +</Table> Copied: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JListTab.jaxx (from rev 840, trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JListTab.jaxx (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JListTab.jaxx 2008-02-11 21:02:06 UTC (rev 842) @@ -0,0 +1,55 @@ +<Table> + <style source="/../common.css"/> + <script> + import static org.codelutin.i18n.I18n._; + </script> +  + <row> + <cell fill='horizontal' insets='0,0,0,0'> + <JPopupMenu id="tablePopupMenu" invoker='{table}' enabled='false'> + <JMenuItem id='synchronizeElement'/> + <JMenuItem id='exportElement'/> + <JMenuItem id='downloadElement'/> + <JMenuItem id='deleteElement'/> + </JPopupMenu> + <JToolBar> + <JButton id='importElement'/> + <JTextField id='searchText' toolTipText='{_("simexplorer.action.searchText.tooltip")}'/> + <JButton id='search'/> + <JButton id='resetSearch'/> + <JButton id='advancedSearch'/> + <JComboBox id='changeSizor' enabled='false' font-size='9' opaque='false' preferredSize='{new Dimension(50,5)}'> + <item value='5'/> + <item value='10'/> + <item value='20'/> + <item value='50'/> + <item value='100'/> + <item value='200'/> + <item value='500'/> + </JComboBox> + </JToolBar> + </cell> + </row> + <row fill='both' weightx='1' weighty='1'> + <cell insets='0,0,0,0'> + <JScrollPane> + <JTable id='table' model='{new fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel()}'/> + </JScrollPane> + </cell> + </row> +  + <row> + <cell anchor='center' insets='0,0,0,0'> + <JToolBar> + <JButton id='goFirstPage' enabled='{goPage.getSelectedIndex()>0}'/> + <JButton id='goPreviousPage' enabled='{goPage.getSelectedIndex()>0}'/> + <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> +</Table> Copied: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JSynchronizeTab.jaxx (from rev 840, trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationSynchronizeTab.jaxx) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JSynchronizeTab.jaxx (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JSynchronizeTab.jaxx 2008-02-11 21:02:06 UTC (rev 842) @@ -0,0 +1,68 @@ +<Table> + <style source="/../common.css"/> + <style> + .border { + border:{javax.swing.border.LineBorder.createBlackLineBorder()}; + height:28; + } + </style> + <script> + import static org.codelutin.i18n.I18n._; + </script> + <row> + <cell> + <Table id='toolbarNavigationLocal' styleClass='border' insets='0,0,0,0'> + <row> + <cell weightx="1" fill='horizontal'> + <JPanel opaque='false' > + <JLabel id='navigationHeaderLocal' text='{_("simexplorer.node.navigation")}'/> + </JPanel> + </cell> + <cell anchor="east"> + <JToolBar> + <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 weightx="1" fill='horizontal'> + <JPanel opaque='false' > + <JLabel id='navigationHeaderRemote' text='{_("simexplorer.node.navigation")}'/> + </JPanel> + </cell> + <cell anchor="east"> + <JToolBar> + <JButton id='collapseAllRemote'/> + <JButton id='expandAllRemote'/> + </JToolBar> + </cell> + </row> + </Table> + </cell> + </row> + <row fill="both" weightx="1" weighty="1"> + <cell insets='0,0,0,0'> + <JScrollPane columnHeaderView='{toolbarNavigationLocal}'> + <JTree id='contentTreeLocal' model='{new javax.swing.tree.DefaultTreeModel(null)}'/> + </JScrollPane> + </cell> + <cell fill='vertical' insets='0,0,0,0'> + <JToolBar> + <JButton id='exportElementToRemote'/> + <JButton id='exportElementToLocale'/> + </JToolBar> + </cell> + <cell insets='0,0,0,0' weightx="1" weighty="1"> + <JScrollPane columnHeaderView='{toolbarNavigationRemote}'> + <JTree id='contentTreeRemote' model='{new javax.swing.tree.DefaultTreeModel(null)}'/> + </JScrollPane> + </cell> + </row> +</Table>

1 0

r841 - trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org Feb. 11, 2008

Feb. 11, 2008

Author: tchemit Date: 2008-02-11 20:57:43 +0000 (Mon, 11 Feb 2008) New Revision: 841 Removed: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/panel/ Log: re inutil

1 0

r840 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org Feb. 11, 2008

Feb. 11, 2008

Author: tchemit Date: 2008-02-11 20:56:52 +0000 (Mon, 11 Feb 2008) New Revision: 840 Removed: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/LaunchSynchronizeAction.java Log: normalisation nom de l'action de synchronisation Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/LaunchSynchronizeAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/LaunchSynchronizeAction.java 2008-02-11 20:56:44 UTC (rev 839) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/LaunchSynchronizeAction.java 2008-02-11 20:56:52 UTC (rev 840) @@ -1,53 +0,0 @@ -/* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, -* Tony Chemit -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.ui.swing.actions; - -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; -import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; - -import java.awt.event.ActionEvent; - -/** - * Action pouyr lancer la synchro - * - * @author tony - */ - at jaxx.runtime.builder.ActionConfig( - actionCommand = "launchSynchronize", - name = "simexplorer.action.synchronize", - shortDescription = "simexplorer.action.synchronize.tooltip", - longDescription = "simexplorer.action.synchronize.help", - smallIcon = "action/reload.png", - hideActionText = true -) -public class LaunchSynchronizeAction extends SimExplorerAbstractTabAction { - - private static final long serialVersionUID = 8379937369551031306L; - - public LaunchSynchronizeAction(String name) { - super(name); - } - - @Override - protected void doAction(ActionEvent e) throws Exception { - super.doAction(e); - //TODO prepare SynchronizeTabModel with uuid et version - throw new SimExplorerRuntimeException(this+" is not implemented yet!"); - } -} \ No newline at end of file

1 0

r839 - in trunk/simexplorer-is/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing/actions resources uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org Feb. 11, 2008

Feb. 11, 2008

Author: tchemit Date: 2008-02-11 20:56:44 +0000 (Mon, 11 Feb 2008) New Revision: 839 Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SynchronizeElementAction.java Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx Log: normalisation nom de l'action de synchronisation Copied: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SynchronizeElementAction.java (from rev 837, trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/LaunchSynchronizeAction.java) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SynchronizeElementAction.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SynchronizeElementAction.java 2008-02-11 20:56:44 UTC (rev 839) @@ -0,0 +1,53 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.ui.swing.actions; + +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; + +import java.awt.event.ActionEvent; + +/** + * Action pour lancer la synchro + * + * @author tony + */ + at jaxx.runtime.builder.ActionConfig( + actionCommand = "synchronizeElement", + name = "simexplorer.action.synchronize", + shortDescription = "simexplorer.action.synchronize.tooltip", + longDescription = "simexplorer.action.synchronize.help", + smallIcon = "action/reload.png", + hideActionText = true +) +public class SynchronizeElementAction extends SimExplorerAbstractTabAction { + + private static final long serialVersionUID = 8379937369551031306L; + + public SynchronizeElementAction(String name) { + super(name); + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + super.doAction(e); + //TODO prepare SynchronizeTabModel with uuid et version + throw new SimExplorerRuntimeException(this+" is not implemented yet!"); + } +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties 2008-02-11 20:56:14 UTC (rev 838) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/actions.properties 2008-02-11 20:56:44 UTC (rev 839) @@ -25,7 +25,7 @@ action.showTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.actions.ShowSynchronizeTabAction # ??? TODO suppress -action.launchSynchronize=fr.cemagref.simexplorer.is.ui.swing.actions.LaunchSynchronizeAction +action.synchronizeElement=fr.cemagref.simexplorer.is.ui.swing.actions.SynchronizeElementAction # toggle tab actions action.toggleTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.ToggleLocalTabAction Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-11 20:56:14 UTC (rev 838) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-11 20:56:44 UTC (rev 839) @@ -39,7 +39,7 @@ </cell> <cell anchor="east"> <JToolBar> - <JButton id='launchSynchronize'/> + <JButton id='synchronizeElement'/> <JButton id='exportElement'/> <JButton id='downloadElement'/> <JButton id='deleteElement'/> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-02-11 20:56:14 UTC (rev 838) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationListTab.jaxx 2008-02-11 20:56:44 UTC (rev 839) @@ -7,7 +7,7 @@ <row> <cell fill='horizontal' insets='0,0,0,0'> <JPopupMenu id="tablePopupMenu" invoker='{table}' enabled='false'> - <JMenuItem id='launchSynchronize'/> + <JMenuItem id='synchronizeElement'/> <JMenuItem id='exportElement'/> <JMenuItem id='downloadElement'/> <JMenuItem id='deleteElement'/>

1 0

r838 - trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/panel
by tchemit＠users.labs.libre-entreprise.org Feb. 11, 2008

Feb. 11, 2008

Author: tchemit Date: 2008-02-11 20:56:14 +0000 (Mon, 11 Feb 2008) New Revision: 838 Removed: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/panel/JApplicationsTreePanel.jaxx Log: suppression panel inutile Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/panel/JApplicationsTreePanel.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/panel/JApplicationsTreePanel.jaxx 2008-02-11 20:51:47 UTC (rev 837) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/panel/JApplicationsTreePanel.jaxx 2008-02-11 20:56:14 UTC (rev 838) @@ -1,7 +0,0 @@ -<JPanel> - <script> - import static org.codelutin.i18n.I18n._; - </script> - <JLabel text="ApplicationsTreePanel"/> -</JPanel> - \ No newline at end of file

1 0

r837 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing: . actions
by tchemit＠users.labs.libre-entreprise.org Feb. 11, 2008

Feb. 11, 2008

Author: tchemit Date: 2008-02-11 20:51:47 +0000 (Mon, 11 Feb 2008) New Revision: 837 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/LaunchSynchronizeAction.java Log: par defaut on affiche pas le texte de l'action synchronise + rafraichissement de cette action dans l'onglet de detail Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-11 20:43:02 UTC (rev 836) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-11 20:51:47 UTC (rev 837) @@ -218,14 +218,16 @@ * @param node le node sélectionné dans l'arbre de navigation */ public static void refreshDetailActions(JApplicationDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { + // refresh synchronize action button + refreshSynchroniseElementAction(ui, model); // refresh download LoggableElement button - refreshDownloadLoggableElementAction(ui, model, node); + refreshDownloadElementAction(ui, model, node); // refresh delete button - refreshDeleteLoggableElementAction(ui, model); + refreshDeleteElementAction(ui, model); // refresh export button refreshExportAction(ui, model); // refresh download Attachment button - refreshDownloadAttachmentAction(ui, model); + refreshDownloadAttachmentAction(ui, model); // refresh tree buttons refreshTreeActions(ui, node); } @@ -240,14 +242,14 @@ updateButton(ui.getExpandAll(), enabled, tooltip); } - protected static void refreshDownloadLoggableElementAction(JApplicationDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { + protected static void refreshDownloadElementAction(JApplicationDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { MetaData detail = model.getDetail(); boolean enabled = detail != null || LoggableElementTreeHelper.canDownload(node); String tooltip = !enabled ? null : _("simexplorer.action.downloadLoggableElement.tooltip", detail == null ? node.getUserObject() : detail.getName() + " - " + model.getSelectedVersion()); updateButton(ui.getDownloadElement(), enabled, tooltip); } - protected static void refreshDeleteLoggableElementAction(JApplicationDetailTab ui, DetailTabModel model) { + protected static void refreshDeleteElementAction(JApplicationDetailTab ui, DetailTabModel model) { MetaData detail = model.getDetail(); boolean enabled = detail != null; String tooltip = !enabled ? null : _("simexplorer.action.deleteLoggableElement.tooltip", detail.getName() + " - " + model.getSelectedVersion()); @@ -262,6 +264,13 @@ updateButton(ui.getDownloadAttachment(), enabled, tooltip); } + public static void refreshSynchroniseElementAction(JApplicationDetailTab ui, DetailTabModel model) { + MetaData detail = model.getDetail(); + boolean enabled = detail != null; + String tooltip = !enabled ? null : _("simexplorer.action.synchronize.tooltip", detail.getName() + " - " + model.getSelectedVersion()); + updateButton(ui.getLaunchSynchronize(), enabled, tooltip); + } + protected static void refreshExportAction(JApplicationDetailTab ui, DetailTabModel model) { MetaData detail = model.getDetail(); LoggableElement sNode = model.getSelectedNode(); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/LaunchSynchronizeAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/LaunchSynchronizeAction.java 2008-02-11 20:43:02 UTC (rev 836) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/LaunchSynchronizeAction.java 2008-02-11 20:51:47 UTC (rev 837) @@ -34,7 +34,7 @@ shortDescription = "simexplorer.action.synchronize.tooltip", longDescription = "simexplorer.action.synchronize.help", smallIcon = "action/reload.png", - hideActionText = false + hideActionText = true ) public class LaunchSynchronizeAction extends SimExplorerAbstractTabAction {

1 0

r836 - in trunk/simexplorer-is/simexplorer-is-storage/src: java resources
by tchemit＠users.labs.libre-entreprise.org Feb. 11, 2008

Feb. 11, 2008

Author: tchemit Date: 2008-02-11 20:43:02 +0000 (Mon, 11 Feb 2008) New Revision: 836 Added: trunk/simexplorer-is/simexplorer-is-storage/src/resources/META-INF/ Removed: trunk/simexplorer-is/simexplorer-is-storage/src/java/META-INF/ Log: les configs dans le rep resources et non pas dans le code java :) Copied: trunk/simexplorer-is/simexplorer-is-storage/src/resources/META-INF (from rev 833, trunk/simexplorer-is/simexplorer-is-storage/src/java/META-INF)

1 0