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

r1575 - tags
by tchemit＠users.labs.libre-entreprise.org 23 Apr '09

23 Apr '09

Author: tchemit Date: 2009-04-23 01:02:34 +0000 (Thu, 23 Apr 2009) New Revision: 1575 Added: tags/1.0-from-branche-migration-200901/ Log: [Netbeans SVN client generated message: create a new folder for the copy]: ' un tag avant le merge finale vers le trunk '

1 0

r1574 - branches/migration-200901/simexplorer-is/simexplorer-is-swing
by tchemit＠users.labs.libre-entreprise.org 23 Apr '09

23 Apr '09

Author: tchemit Date: 2009-04-23 00:52:50 +0000 (Thu, 23 Apr 2009) New Revision: 1574 Modified: branches/migration-200901/simexplorer-is/simexplorer-is-swing/ Log: svn ignore sur fichiers netbeans Property changes on: branches/migration-200901/simexplorer-is/simexplorer-is-swing ___________________________________________________________________ Name: svn:ignore - .* target + target .* nbactions.xml

1 0

r1573 - branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui
by tchemit＠users.labs.libre-entreprise.org 22 Apr '09

22 Apr '09

Author: tchemit Date: 2009-04-22 23:58:37 +0000 (Wed, 22 Apr 2009) New Revision: 1573 Added: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/NavigationTreeCellRenderer.java Modified: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx Log: ajout d'un renderer sur l'arbre de navigation afin de pouvoir modifier le rendu des objets Modified: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx 2009-04-22 22:45:18 UTC (rev 1572) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/JDetailTab.jaxx 2009-04-22 23:58:37 UTC (rev 1573) @@ -1,3 +1,4 @@ + <JAXXTab> <style source="common.css"/> <row> @@ -14,7 +15,7 @@ <JLabel id='detailHeaderFromRemote' opaque='false' text='simexplorer.node.navigation.remote' visible='false' icon='{createImageIcon("action/remote.png")}'/> - </cell> + </cell> <cell anchor="east" insets='0,0,0,0'> <JToolBar> <JButton id='historyPrevious'/> @@ -58,10 +59,11 @@ <cell columns="2"> <JSplitPane id='splitOne' orientation="horizontal" resizeWeight="0.45" oneTouchExpandable='true'> <JScrollPane columnHeaderView='{toolbarNavigation}'> - <JTree id="navigationTree" model='{new javax.swing.tree.DefaultTreeModel(null)}' styleClass='smallSize'/> + <JTree id="navigationTree" model='{new javax.swing.tree.DefaultTreeModel(null)}' styleClass='smallSize' + cellRenderer='{new NavigationTreeCellRenderer()}'/> </JScrollPane> <JScrollPane id="scrollPane" columnHeaderView='{toolbarDetail}' border='{null}' horizontalScrollBarPolicy='horizontal_scrollbar_never' verticalScrollBarPolicy='vertical_scrollbar_never'> - <Table id='detail' insets='2,2,2,1'> + <Table id='detail' insets='2,2,2,1'> <row fill='vertical'> <cell anchor='west'> <JLabel text='simexplorer.common.type'/> @@ -88,7 +90,7 @@ </row> <row> <cell fill='horizontal' columns="2" insets='3,0,0,1'> - <JPanel styleClass='border'> + <JPanel styleClass='border'> <JLabel id='detailDescriptorsHeader'/> </JPanel> </cell> @@ -112,7 +114,7 @@ </cell> <cell fill='horizontal' anchor="east"> <JToolBar> - <JButton id='downloadAttachment'/> + <JButton id='downloadAttachment'/> </JToolBar> </cell> </row> Added: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/NavigationTreeCellRenderer.java =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/NavigationTreeCellRenderer.java (rev 0) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/NavigationTreeCellRenderer.java 2009-04-22 23:58:37 UTC (rev 1573) @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2008 Cemagref + * + * 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 3 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, see <http://www.gnu.org/licenses/>. + */ +package fr.cemagref.simexplorer.is.ui.swing.ui; + +import fr.cemagref.simexplorer.is.entities.data.Component; +import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; +import javax.swing.JTree; +import javax.swing.tree.DefaultTreeCellRenderer; + +/** + * Le renderer à utiliser pour l'arbre de navigation dans l'onglet de détail. + * + * @author chemit + * @since 1.0 + */ +public class NavigationTreeCellRenderer extends DefaultTreeCellRenderer { + + private static final long serialVersionUID = 1L; + + @Override + public java.awt.Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { + if (value instanceof EntityTreeNode) { + EntityTreeNode n = (EntityTreeNode) value; + Object o = n.get(); + if (o instanceof Component) { + value = getComponentText((Component) o); + } + } + java.awt.Component comp = super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); + return comp; + } + + /** + * @param c le component dont on veut le rendu + * @return le rendu d'un component. + */ + protected String getComponentText(Component c) { + String value = c.toString() + " [" + c.getMetaData().getVersion() + "]"; + return value; + } +}

1 0

r1572 - branches/migration-200901/simexplorer-is
by tchemit＠users.labs.libre-entreprise.org 22 Apr '09

22 Apr '09

Author: tchemit Date: 2009-04-22 22:45:18 +0000 (Wed, 22 Apr 2009) New Revision: 1572 Modified: branches/migration-200901/simexplorer-is/pom.xml Log: bump versions : - jaxx - lutinwidget - maven-i18n-plugin Modified: branches/migration-200901/simexplorer-is/pom.xml =================================================================== --- branches/migration-200901/simexplorer-is/pom.xml 2009-04-20 15:15:21 UTC (rev 1571) +++ branches/migration-200901/simexplorer-is/pom.xml 2009-04-22 22:45:18 UTC (rev 1572) @@ -278,11 +278,11 @@ <labs.project>simexplorer-si</labs.project>  - <jaxx.version>1.2-SNAPSHOT</jaxx.version> + <jaxx.version>1.3</jaxx.version> <commandline.version>1.0</commandline.version> <lutinutil.version>1.0.3</lutinutil.version> - <lutinwidget.version>0.13</lutinwidget.version> - <i18n.version>0.9</i18n.version> + <lutinwidget.version>0.14</lutinwidget.version> + <i18n.version>0.11</i18n.version> <jrst.version>0.8.4</jrst.version> <license-switcher.version>0.6</license-switcher.version>

1 0

r1571 - branches/migration-200901/simexplorer-is
by dumoulin＠users.labs.libre-entreprise.org 20 Apr '09

20 Apr '09

Author: dumoulin Date: 2009-04-20 15:15:21 +0000 (Mon, 20 Apr 2009) New Revision: 1571 Modified: branches/migration-200901/simexplorer-is/pom.xml Log: commandline version used is 1.0 Modified: branches/migration-200901/simexplorer-is/pom.xml =================================================================== --- branches/migration-200901/simexplorer-is/pom.xml 2009-04-20 13:49:07 UTC (rev 1570) +++ branches/migration-200901/simexplorer-is/pom.xml 2009-04-20 15:15:21 UTC (rev 1571) @@ -279,7 +279,7 @@  <jaxx.version>1.2-SNAPSHOT</jaxx.version> - <commandline.version>1.2-SNAPSHOT</commandline.version> + <commandline.version>1.0</commandline.version> <lutinutil.version>1.0.3</lutinutil.version> <lutinwidget.version>0.13</lutinwidget.version> <i18n.version>0.9</i18n.version>

1 0

r1570 - branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/main/resources
by dumoulin＠users.labs.libre-entreprise.org 20 Apr '09

20 Apr '09

Author: dumoulin Date: 2009-04-20 13:49:07 +0000 (Mon, 20 Apr 2009) New Revision: 1570 Modified: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/main/resources/log4j.properties Log: logger en mode ERROR par d?\195?\169faut Modified: branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/main/resources/log4j.properties =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/main/resources/log4j.properties 2009-04-20 13:38:26 UTC (rev 1569) +++ branches/migration-200901/simexplorer-is/simexplorer-is-swing/src/main/resources/log4j.properties 2009-04-20 13:49:07 UTC (rev 1570) @@ -1,5 +1,5 @@ # Global logging configuration -log4j.rootLogger=DEBUG, stdout +log4j.rootLogger=ERROR, stdout # Console output... log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout @@ -9,5 +9,3 @@ log4j.logger.fr.cemagref.simexplorer.is=INFO log4j.logger.org.codelutin=INFO log4j.logger.jaxx=INFO - -

1 0

r1569 - branches/migration-200901/simexplorer-is/simexplorer-is-storage/src/main/resources/properties
by dumoulin＠users.labs.libre-entreprise.org 20 Apr '09

20 Apr '09

Author: dumoulin Date: 2009-04-20 13:38:26 +0000 (Mon, 20 Apr 2009) New Revision: 1569 Modified: branches/migration-200901/simexplorer-is/simexplorer-is-storage/src/main/resources/properties/config.properties Log: simexplorer.adminmail updated Modified: branches/migration-200901/simexplorer-is/simexplorer-is-storage/src/main/resources/properties/config.properties =================================================================== --- branches/migration-200901/simexplorer-is/simexplorer-is-storage/src/main/resources/properties/config.properties 2009-03-06 11:10:32 UTC (rev 1568) +++ branches/migration-200901/simexplorer-is/simexplorer-is-storage/src/main/resources/properties/config.properties 2009-04-20 13:38:26 UTC (rev 1569) @@ -1,4 +1,4 @@ simexplorer.db=/var/local/simexplorer/server-db simexplorer.data=/var/local/simexplorer/server-data/ simexplorer.optimizeperiod=3600 -simexplorer.adminmail=chemit at codelutin.com +simexplorer.adminmail=is-admin at simexplorer.org

1 0

r1568 - tags/0.1.RC3/simexplorer-is
by dumoulin＠users.labs.libre-entreprise.org 06 Mar '09

06 Mar '09

Author: dumoulin Date: 2009-03-06 11:10:32 +0000 (Fri, 06 Mar 2009) New Revision: 1568 Modified: tags/0.1.RC3/simexplorer-is/pom.xml Log: commandline version updated Modified: tags/0.1.RC3/simexplorer-is/pom.xml =================================================================== --- tags/0.1.RC3/simexplorer-is/pom.xml 2009-03-04 15:56:11 UTC (rev 1567) +++ tags/0.1.RC3/simexplorer-is/pom.xml 2009-03-06 11:10:32 UTC (rev 1568) @@ -279,7 +279,7 @@  <jaxx.version>1.2-SNAPSHOT</jaxx.version> - <commandline.version>1.2-SNAPSHOT</commandline.version> + <commandline.version>1.0</commandline.version> <lutinutil.version>1.0.3</lutinutil.version> <lutinwidget.version>0.13</lutinwidget.version> <i18n.version>0.9</i18n.version>

1 0

r1567 - tags/0.1.RC3/simexplorer-is
by dumoulin＠users.labs.libre-entreprise.org 04 Mar '09

04 Mar '09

Author: dumoulin Date: 2009-03-04 15:56:11 +0000 (Wed, 04 Mar 2009) New Revision: 1567 Modified: tags/0.1.RC3/simexplorer-is/pom.xml Log: commandline version updated Modified: tags/0.1.RC3/simexplorer-is/pom.xml =================================================================== --- tags/0.1.RC3/simexplorer-is/pom.xml 2009-03-04 15:54:12 UTC (rev 1566) +++ tags/0.1.RC3/simexplorer-is/pom.xml 2009-03-04 15:56:11 UTC (rev 1567) @@ -279,7 +279,7 @@  <jaxx.version>1.2-SNAPSHOT</jaxx.version> - <commandline.version>1.1-SNAPSHOT</commandline.version> + <commandline.version>1.2-SNAPSHOT</commandline.version> <lutinutil.version>1.0.3</lutinutil.version> <lutinwidget.version>0.13</lutinwidget.version> <i18n.version>0.9</i18n.version>

1 0

r1566 - branches/migration-200901/simexplorer-is
by dumoulin＠users.labs.libre-entreprise.org 04 Mar '09

04 Mar '09

Author: dumoulin Date: 2009-03-04 15:54:12 +0000 (Wed, 04 Mar 2009) New Revision: 1566 Modified: branches/migration-200901/simexplorer-is/pom.xml Log: commandline version updated Modified: branches/migration-200901/simexplorer-is/pom.xml =================================================================== --- branches/migration-200901/simexplorer-is/pom.xml 2009-02-25 14:32:49 UTC (rev 1565) +++ branches/migration-200901/simexplorer-is/pom.xml 2009-03-04 15:54:12 UTC (rev 1566) @@ -279,7 +279,7 @@  <jaxx.version>1.2-SNAPSHOT</jaxx.version> - <commandline.version>1.1-SNAPSHOT</commandline.version> + <commandline.version>1.2-SNAPSHOT</commandline.version> <lutinutil.version>1.0.3</lutinutil.version> <lutinwidget.version>0.13</lutinwidget.version> <i18n.version>0.9</i18n.version>

1 0