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

r675 - in trunk/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing/actions uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org 04 Feb '08

04 Feb '08

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">  - <JList id='historyList'/> + <JList id='historyList' model='{new DefaultListModel()}'/>  </JScrollPane> </JSplitPane>

1 0

r674 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 04 Feb '08

04 Feb '08

Author: tchemit Date: 2008-02-04 20:34:41 +0000 (Mon, 04 Feb 2008) New Revision: 674 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java Log: fix bug : le node root n'est pas forcement exportable Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java 2008-02-04 20:26:07 UTC (rev 673) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java 2008-02-04 20:34:41 UTC (rev 674) @@ -87,7 +87,7 @@ } public static boolean canExport(LoggableElementTreeNode node) { - return node != null && node.isRoot(); + return isLoggableElement(node) && node.getUserObject() instanceof ExplorationApplication; } public static boolean canDelete(LoggableElementTreeNode node) {

1 0

r673 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 04 Feb '08

04 Feb '08

Author: tchemit Date: 2008-02-04 20:26:07 +0000 (Mon, 04 Feb 2008) New Revision: 673 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java Log: attention, les nodes de l'arbre de niavgation ne sont pas tous les LoggableElement 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:25:40 UTC (rev 672) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-04 20:26:07 UTC (rev 673) @@ -95,7 +95,9 @@ // update actions SimExplorerUIRefreshHelper.refreshDetailActions(ui, model, node); - model.setSelectedNode((LoggableElement) (node == null ? null : node.getUserObject())); + Object o = node == null ? null : node.getUserObject(); + // le node estacceptable uniquement si c'est un loggableElement + model.setSelectedNode((LoggableElement) (o instanceof LoggableElement? o:null)); // update detail panel //updateDetail(ui, model, node, service, token);

1 0

r672 - trunk/simexplorer-is-swing
by tchemit＠users.labs.libre-entreprise.org 04 Feb '08

04 Feb '08

Author: tchemit Date: 2008-02-04 20:25:40 +0000 (Mon, 04 Feb 2008) New Revision: 672 Modified: trunk/simexplorer-is-swing/profiles.xml Log: plus besoin de reecrire les proprietes, celles du pom parent sont prises en compte Modified: trunk/simexplorer-is-swing/profiles.xml =================================================================== --- trunk/simexplorer-is-swing/profiles.xml 2008-02-04 20:25:03 UTC (rev 671) +++ trunk/simexplorer-is-swing/profiles.xml 2008-02-04 20:25:40 UTC (rev 672) @@ -6,13 +6,8 @@ <profile> <id>project</id> <properties> -  <maven.src.dir>${basedir}/target/src-build</maven.src.dir> -  - <maven.compile.source>1.6</maven.compile.source> - <maven.compile.target>1.6</maven.compile.target> - <maven.compile.encoding>ISO-8859-15</maven.compile.encoding>  <maven.jar.main.class> fr.cemagref.simexplorer.is.ui.SimExplorer

1 0

r671 - trunk/simexplorer-is
by tchemit＠users.labs.libre-entreprise.org 04 Feb '08

04 Feb '08

Author: tchemit Date: 2008-02-04 20:25:03 +0000 (Mon, 04 Feb 2008) New Revision: 671 Removed: trunk/simexplorer-is/profiles.xml Log: Yes! contournement du probleme de non prise en compte des proprietes lors de l'utilisation de maven sur les modules. Maintenant ca fonctionne bien :) Deleted: trunk/simexplorer-is/profiles.xml =================================================================== --- trunk/simexplorer-is/profiles.xml 2008-02-04 20:24:37 UTC (rev 670) +++ trunk/simexplorer-is/profiles.xml 2008-02-04 20:25:03 UTC (rev 671) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<settings xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> - <profiles> - <profile> - <id>project</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> -  - <labs.id>130</labs.id> - <maven.verbose>false</maven.verbose> -  - <maven.src.dir>${basedir}/src</maven.src.dir> -  - <maven.test.skip>true</maven.test.skip> -  - <maven.compile.source>1.6</maven.compile.source> - <maven.compile.target>1.6</maven.compile.target> - <maven.compile.encoding>ISO-8859-15</maven.compile.encoding> - </properties> - </profile> - </profiles> -</settings> \ No newline at end of file

1 0

r670 - trunk/simexplorer-is
by tchemit＠users.labs.libre-entreprise.org 04 Feb '08

04 Feb '08

Author: tchemit Date: 2008-02-04 20:24:37 +0000 (Mon, 04 Feb 2008) New Revision: 670 Modified: trunk/simexplorer-is/pom.xml Log: Yes! contournement du probleme de non prise en compte des proprietes lors de l'utilisation de maven sur les modules. Maintenant ca fonctionne bien :) Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-02-04 19:51:54 UTC (rev 669) +++ trunk/simexplorer-is/pom.xml 2008-02-04 20:24:37 UTC (rev 670) @@ -28,6 +28,38 @@ <description>simexplorer is</description> <inceptionYear>2008</inceptionYear> +  + <profiles> + <profile> + <id>project</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> +  + <labs.id>130</labs.id> +  + <maven.verbose>false</maven.verbose> +  + <maven.src.dir>${basedir}/src</maven.src.dir> +  + <maven.test.skip>true</maven.test.skip> +  + <maven.compile.source>1.6</maven.compile.source> + <maven.compile.target>1.6</maven.compile.target> +  + <maven.compile.encoding>ISO-8859-15</maven.compile.encoding> + </properties> + </profile> + </profiles> +  <issueManagement> <url> @@ -58,7 +90,7 @@ <url>http://download.java.net/maven/2</url> </repository> </repositories> - + <build> <plugins> <plugin>

1 0

r669 - trunk/simexplorer-is-swing
by tchemit＠users.labs.libre-entreprise.org 04 Feb '08

04 Feb '08

Author: tchemit Date: 2008-02-04 19:51:54 +0000 (Mon, 04 Feb 2008) New Revision: 669 Modified: trunk/simexplorer-is-swing/go.sh Log: modification du script de d?\195?\169marrage : si une erreur intervient pendant l'ex?\195?\169cution de maven, on affiche la trace maven et on quitte Modified: trunk/simexplorer-is-swing/go.sh =================================================================== --- trunk/simexplorer-is-swing/go.sh 2008-02-04 19:50:57 UTC (rev 668) +++ trunk/simexplorer-is-swing/go.sh 2008-02-04 19:51:54 UTC (rev 669) @@ -99,9 +99,14 @@ ####### launch maven if required ############################################## ############################################################################### if [ ! "$MVN_ACTION" = "" ]; then - action="mvn $MVN_ACTION $OFF_LINE > $MOUTPUT" + action="mvn -e $MVN_ACTION $OFF_LINE > $MOUTPUT" echo "$action" eval "$action" + if [ $? != 0 ] ; then + echo "error with maven :" + cat $MOUTPUT + exit 1 + fi echo "mvn done." fi

1 0

r668 - trunk/simexplorer-is-swing
by tchemit＠users.labs.libre-entreprise.org 04 Feb '08

04 Feb '08

Author: tchemit Date: 2008-02-04 19:50:57 +0000 (Mon, 04 Feb 2008) New Revision: 668 Modified: trunk/simexplorer-is-swing/profiles.xml Log: oblig?\195?\169 de dupliquer les propri?\195?\169t?\195?\169s du profile car si on veut lancer maven directement sur le module, il n'y a pas de prise en compte des propri?\195?\169t?\195?\169s du parent, c'est dommage... TODO voir si cela marche lorsque dans le parent, on positionne directement le profile dans le POM et non plus dans le fichier profiles.xml Modified: trunk/simexplorer-is-swing/profiles.xml =================================================================== --- trunk/simexplorer-is-swing/profiles.xml 2008-02-04 19:37:06 UTC (rev 667) +++ trunk/simexplorer-is-swing/profiles.xml 2008-02-04 19:50:57 UTC (rev 668) @@ -6,9 +6,14 @@ <profile> <id>project</id> <properties> -  + +  <maven.src.dir>${basedir}/target/src-build</maven.src.dir> -  +  + <maven.compile.source>1.6</maven.compile.source> + <maven.compile.target>1.6</maven.compile.target> + <maven.compile.encoding>ISO-8859-15</maven.compile.encoding> +  <maven.jar.main.class> fr.cemagref.simexplorer.is.ui.SimExplorer </maven.jar.main.class>

1 0

r667 - trunk/simexplorer-is-swing
by tchemit＠users.labs.libre-entreprise.org 04 Feb '08

04 Feb '08

Author: tchemit Date: 2008-02-04 19:37:06 +0000 (Mon, 04 Feb 2008) New Revision: 667 Modified: trunk/simexplorer-is-swing/pom.xml Log: les actions a ne pas traiter dansle parsing i18n sont de la forme *AbstractAction.java Modified: trunk/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is-swing/pom.xml 2008-02-04 19:35:11 UTC (rev 666) +++ trunk/simexplorer-is-swing/pom.xml 2008-02-04 19:37:06 UTC (rev 667) @@ -143,7 +143,7 @@ <param>**\/*Action.java</param> </includes> <excludes> - <param>**\/*Abstract*Action.java</param> + <param>**\/*AbstractAction.java</param> </excludes> </entry> <entry>

1 0

r666 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 04 Feb '08

04 Feb '08

Author: tchemit Date: 2008-02-04 19:35:11 +0000 (Mon, 04 Feb 2008) New Revision: 666 Removed: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/ Log: supression repertoire inutilis?\195?\169

1 0