Author: tchemit Date: 2008-02-04 20:57:41 +0000 (Mon, 04 Feb 2008) New Revision: 675 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: positionnement des modeles d'ui dans le template jaxx Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-04 20:34:41 UTC (rev 674) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-04 20:57:41 UTC (rev 675) @@ -30,7 +30,6 @@ import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; -import javax.swing.DefaultListModel; import javax.swing.JTree; import javax.swing.ListModel; import javax.swing.event.ListSelectionEvent; @@ -63,23 +62,7 @@ super(name); } - /*@Override - protected boolean beforeAction(ActionEvent e) throws Exception { - super.beforeAction(e); - DetailTabModel model = getTabModel(); - LoggableElement bean = model.getRootNode(); - MetaData data = bean.getMetaData(); - String uuid = data.getUuid(); - Version version = data.getVersion(); - log.info("show detail uuid:" + uuid + ", version:" + version + " (remote ?" + model.isRemote() + ")"); - return true; - } */ - protected void initFirstUsage(final JApplicationDetailTab ui, final DetailTabModel model) { - //TODO cela peut être fait dans jaxx - ui.getNavigationTree().setModel(new DefaultTreeModel(null)); - //TODO cela peut être fait dans jaxx - ui.getHistoryList().setModel(new DefaultListModel()); // add a listener on navigation tree ui.getNavigationTree().addTreeSelectionListener(new TreeSelectionListener() { @@ -96,8 +79,8 @@ SimExplorerUIRefreshHelper.refreshDetailActions(ui, model, node); Object o = node == null ? null : node.getUserObject(); - // le node estacceptable uniquement si c'est un loggableElement - model.setSelectedNode((LoggableElement) (o instanceof LoggableElement? o:null)); + // le node est acceptable uniquement si c'est un loggableElement + model.setSelectedNode((LoggableElement) (o instanceof LoggableElement ? o : null)); // update detail panel //updateDetail(ui, model, node, service, token); @@ -155,12 +138,12 @@ public static void updateHistoryList(JApplicationDetailTab ui, DetailTabModel model, LoggableElementTreeNode node, StorageService service, String token) { //boolean history = LoggableElementTreeHelper.isLoggableElement(node); LoggableElement element = model.getSelectedNode(); - boolean history = element !=null; + boolean history = element != null; if (!history) { model.setVersions(null); model.setSelectedVersion(null); return; - } + } //LoggableElement element = (LoggableElement) node.getUserObject(); try { MetaData[] metas = service.getVersions(token, element.getMetaData().getUuid()); Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-04 20:34:41 UTC (rev 674) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-04 20:57:41 UTC (rev 675) @@ -15,7 +15,7 @@ <cell> <JSplitPane id='splitOne' orientation="horizontal" resizeWeight="0.4" oneTouchExpandable='true'> <JScrollPane columnHeaderView='{toolbar}'> - <JTree id="navigationTree"/> + <JTree id="navigationTree" model='{new javax.swing.tree.DefaultTreeModel(null)}'/> </JScrollPane> <JScrollPane id="scrollPane"> <JSplitPane id='splitTwo' orientation="vertical" resizeWeight="0.6" oneTouchExpandable='true'> @@ -26,7 +26,7 @@ </JScrollPane> <JScrollPane horizontalScrollBarPolicy="horizontal_scrollbar_never"> <!--JPanel id="history"--> - <JList id='historyList'/> + <JList id='historyList' model='{new DefaultListModel()}'/> <!--/JPanel--> </JScrollPane> </JSplitPane>