- Buix-commits - mailman.cloud.codelutin.com

r589 - in trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util: . handler model ui
by tchemit＠users.labs.libre-entreprise.org 19 Apr '08

19 Apr '08

Author: tchemit Date: 2008-04-19 09:16:28 +0000 (Sat, 19 Apr 2008) New Revision: 589 Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/UIHelper.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractUIModel.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractUI.java Log: use lutinui generic ui objects Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/UIHelper.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/UIHelper.java 2008-04-19 08:59:07 UTC (rev 588) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/UIHelper.java 2008-04-19 09:16:28 UTC (rev 589) @@ -19,17 +19,10 @@ import org.codelutin.vcs.type.VCSEntryLocation; import org.codelutin.vcs.type.VCSState; -import javax.swing.AbstractAction; -import javax.swing.Action; import javax.swing.ImageIcon; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JRootPane; import javax.swing.JTable; -import javax.swing.KeyStroke; import javax.swing.ListSelectionModel; import java.awt.Color; -import java.awt.event.ActionEvent; import java.util.EnumMap; import java.util.EnumSet; @@ -41,25 +34,6 @@ public class UIHelper { /** - * Attach to <code>ui</code> an abort action,accessible by <code>ESC</code> key. - * - * @param ui ui - */ - public static void setQuitAction(final JDialog ui) { - JRootPane rootPane = ui.getRootPane(); - - Action quitAction = new AbstractAction("quit") { - private static final long serialVersionUID = -869095664995763057L; - - public void actionPerformed(ActionEvent e) { - ui.dispose(); - } - }; - rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "quit"); - rootPane.getActionMap().put("quit", quitAction); - } - - /** * Prepare an table of VCSEntries. * * @param table table @@ -131,7 +105,7 @@ } public static ImageIcon createActionIcon(String name) { - return jaxx.runtime.UIHelper.createImageIcon("action-" + name + ".png"); + return org.codelutin.ui.UIHelper.createImageIcon("action-" + name + ".png"); } public static ImageIcon createActionIcon(VCSAction location) { @@ -139,6 +113,6 @@ } public static ImageIcon createLocationIcon(VCSEntryLocation location) { - return jaxx.runtime.UIHelper.createImageIcon("location-" + location.name().toLowerCase() + ".png"); + return org.codelutin.ui.UIHelper.createImageIcon("location-" + location.name().toLowerCase() + ".png"); } } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java 2008-04-19 08:59:07 UTC (rev 588) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java 2008-04-19 09:16:28 UTC (rev 589) @@ -14,22 +14,22 @@ */ package org.codelutin.vcs.ui.util.handler; +import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.ui.util.model.AbstractUIModel; import org.codelutin.vcs.ui.util.ui.AbstractUI; -import org.codelutin.vcs.VCSConnexionConfig; /** - * TODO Move this classe in jaxx + * Base ui handler to be used in vcs project. * * @author chemit */ -public abstract class AbstractUIHandler<M extends AbstractUIModel, U extends AbstractUI<? extends AbstractUIHandler>> extends jaxx.DialogUIHandler<M, U> { +public abstract class AbstractUIHandler<M extends AbstractUIModel, U extends AbstractUI<? extends AbstractUIHandler>> extends org.codelutin.ui.DialogUIHandler<M, U> { private VCSConnexionConfig config; - protected AbstractUIHandler(U ui, M model,VCSConnexionConfig config) { + protected AbstractUIHandler(U ui, M model, VCSConnexionConfig config) { super(ui, model); - this.config=config; + this.config = config; } public VCSConnexionConfig getConfig() { Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractUIModel.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractUIModel.java 2008-04-19 08:59:07 UTC (rev 588) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractUIModel.java 2008-04-19 09:16:28 UTC (rev 589) @@ -14,14 +14,11 @@ */ package org.codelutin.vcs.ui.util.model; -import jaxx.DialogUIModel; - /** - * TODO Move this classe in jaxx - * Abstract ui model, with property change support. + * Base ui model tobe used in vcs project * * @author chemit */ -public abstract class AbstractUIModel extends DialogUIModel { +public abstract class AbstractUIModel extends org.codelutin.ui.DialogUIModel { } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractUI.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractUI.java 2008-04-19 08:59:07 UTC (rev 588) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractUI.java 2008-04-19 09:16:28 UTC (rev 589) @@ -17,13 +17,11 @@ import org.codelutin.vcs.ui.util.handler.AbstractUIHandler; /** - * A abstract dialog contract to be realised by a dialog - * <p/> - * TODO : make jaxx authorized implementing interface for root tag :) + * The base dialog to be used in vcs project * * @author chemit */ -public abstract class AbstractUI<H extends AbstractUIHandler> extends jaxx.DialogUI<H> { +public abstract class AbstractUI<H extends AbstractUIHandler> extends org.codelutin.ui.DialogUI<H> { protected javax.swing.AbstractAction createHelpAction() { return org.codelutin.vcs.ui.action.HelpAction.createAction(this);

1 0

r588 - trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 19 Apr '08

19 Apr '08

Author: tchemit Date: 2008-04-19 08:59:07 +0000 (Sat, 19 Apr 2008) New Revision: 588 Removed: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/diff/ Log: del unused

1 0

r587 - in trunk/lutinvcs: . core provider provider/cvs provider/mock provider/svn tools ui ui/common ui/jaxx
by tchemit＠users.labs.libre-entreprise.org 19 Apr '08

19 Apr '08

Author: tchemit Date: 2008-04-19 08:58:45 +0000 (Sat, 19 Apr 2008) New Revision: 587 Modified: trunk/lutinvcs/core/pom.xml trunk/lutinvcs/pom.xml trunk/lutinvcs/provider/cvs/pom.xml trunk/lutinvcs/provider/mock/pom.xml trunk/lutinvcs/provider/pom.xml trunk/lutinvcs/provider/svn/pom.xml trunk/lutinvcs/tools/pom.xml trunk/lutinvcs/ui/common/pom.xml trunk/lutinvcs/ui/jaxx/pom.xml trunk/lutinvcs/ui/pom.xml Log: utilisation de lutinjaxx (?\195?\160 la place de jaxx) ne pas utiliser des num?\195?\169ro de versions par variable dans les poms car cela ne fonctionne pas tres bien (pas de substitution de la variable dans le r?\195?\169pository). Modified: trunk/lutinvcs/core/pom.xml =================================================================== --- trunk/lutinvcs/core/pom.xml 2008-04-18 21:08:18 UTC (rev 586) +++ trunk/lutinvcs/core/pom.xml 2008-04-19 08:58:45 UTC (rev 587) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.vcs</groupId> <artifactId>pom</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </parent> <artifactId>core</artifactId> <name>core</name> <packaging>jar</packaging> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> <description>Lutin vcs library core</description> <build> Modified: trunk/lutinvcs/pom.xml =================================================================== --- trunk/lutinvcs/pom.xml 2008-04-18 21:08:18 UTC (rev 586) +++ trunk/lutinvcs/pom.xml 2008-04-19 08:58:45 UTC (rev 587) @@ -36,7 +36,7 @@   <name>pom</name> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> <description>Versionning Concurrent System lutin library main pom</description> <inceptionYear>2008</inceptionYear> @@ -164,41 +164,41 @@ <artifactId>lutinutil</artifactId> <version>0.31-SNAPSHOT</version> </dependency> - + <dependency> <groupId>org.codelutin.vcs</groupId> <artifactId>core</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.codelutin.vcs</groupId> <artifactId>tools</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.codelutin.vcs.ui</groupId> <artifactId>common</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.codelutin.vcs.ui</groupId> <artifactId>jaxx</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.codelutin.vcs.provider</groupId> <artifactId>mock</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.codelutin.vcs.provider</groupId> <artifactId>cvs</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.codelutin.vcs.provider</groupId> <artifactId>svn</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </dependency>  <dependency> Modified: trunk/lutinvcs/provider/cvs/pom.xml =================================================================== --- trunk/lutinvcs/provider/cvs/pom.xml 2008-04-18 21:08:18 UTC (rev 586) +++ trunk/lutinvcs/provider/cvs/pom.xml 2008-04-19 08:58:45 UTC (rev 587) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.vcs.provider</groupId> <artifactId>pom</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </parent> <artifactId>cvs</artifactId> <name>provider cvs</name> <packaging>jar</packaging> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> <description>Librairie vcs provider cvs</description> <build> Modified: trunk/lutinvcs/provider/mock/pom.xml =================================================================== --- trunk/lutinvcs/provider/mock/pom.xml 2008-04-18 21:08:18 UTC (rev 586) +++ trunk/lutinvcs/provider/mock/pom.xml 2008-04-19 08:58:45 UTC (rev 587) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.vcs.provider</groupId> <artifactId>pom</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </parent> <artifactId>mock</artifactId> <name>provider mock</name> <packaging>jar</packaging> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> <description>Library vcs provider mock</description> <build> Modified: trunk/lutinvcs/provider/pom.xml =================================================================== --- trunk/lutinvcs/provider/pom.xml 2008-04-18 21:08:18 UTC (rev 586) +++ trunk/lutinvcs/provider/pom.xml 2008-04-19 08:58:45 UTC (rev 587) @@ -12,7 +12,7 @@ <parent> <groupId>org.codelutin.vcs</groupId> <artifactId>pom</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </parent> <groupId>org.codelutin.vcs.provider</groupId> @@ -35,7 +35,7 @@   <name>provider pom</name> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> <description>Versionning Concurrent System lutin library provider pom</description> <inceptionYear>2008</inceptionYear> Modified: trunk/lutinvcs/provider/svn/pom.xml =================================================================== --- trunk/lutinvcs/provider/svn/pom.xml 2008-04-18 21:08:18 UTC (rev 586) +++ trunk/lutinvcs/provider/svn/pom.xml 2008-04-19 08:58:45 UTC (rev 587) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.vcs.provider</groupId> <artifactId>pom</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </parent> <artifactId>svn</artifactId> <name>provider svn</name> <packaging>jar</packaging> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> <description>Library vcs provider svn</description> <build> Modified: trunk/lutinvcs/tools/pom.xml =================================================================== --- trunk/lutinvcs/tools/pom.xml 2008-04-18 21:08:18 UTC (rev 586) +++ trunk/lutinvcs/tools/pom.xml 2008-04-19 08:58:45 UTC (rev 587) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.vcs</groupId> <artifactId>pom</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </parent> <artifactId>tools</artifactId> <name>tools</name> <packaging>jar</packaging> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> <description>Lutin vcs tools</description> <build> Modified: trunk/lutinvcs/ui/common/pom.xml =================================================================== --- trunk/lutinvcs/ui/common/pom.xml 2008-04-18 21:08:18 UTC (rev 586) +++ trunk/lutinvcs/ui/common/pom.xml 2008-04-19 08:58:45 UTC (rev 587) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.vcs.ui</groupId> <artifactId>pom</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </parent> <artifactId>common</artifactId> <name>ui common</name> <packaging>jar</packaging> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> <description>Lutin vcs library ui common</description> <build> @@ -42,9 +42,14 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>lutinlib</groupId> - <artifactId>jaxx</artifactId> + <groupId>org.codelutin.ui</groupId> + <artifactId>lutinui</artifactId> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.codelutin.jaxx.provider</groupId> + <artifactId>swing</artifactId> + <scope>compile</scope> + </dependency> </dependencies> </project> Modified: trunk/lutinvcs/ui/jaxx/pom.xml =================================================================== --- trunk/lutinvcs/ui/jaxx/pom.xml 2008-04-18 21:08:18 UTC (rev 586) +++ trunk/lutinvcs/ui/jaxx/pom.xml 2008-04-19 08:58:45 UTC (rev 587) @@ -7,7 +7,7 @@ <parent> <groupId>org.codelutin.vcs.ui</groupId> <artifactId>pom</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </parent> <groupId>org.codelutin.vcs.ui</groupId> @@ -15,7 +15,7 @@ <name>ui jaxx</name> <packaging>jar</packaging> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> <description>Library of VCS ui generated by jaxx</description> <build> @@ -56,7 +56,7 @@ </executions> </plugin> <plugin> - <groupId>lutinplugin</groupId> + <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${maven.src.dir}/main/uimodel</src> @@ -67,8 +67,14 @@ <groupId>org.codelutin.vcs.ui</groupId> <artifactId>common</artifactId> <scope>compile</scope> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.codelutin.jaxx.provider</groupId> + <artifactId>swing</artifactId> + <scope>compile</scope> + <version>0.1-SNAPSHOT</version> + </dependency> </dependencies> <executions> <execution> Modified: trunk/lutinvcs/ui/pom.xml =================================================================== --- trunk/lutinvcs/ui/pom.xml 2008-04-18 21:08:18 UTC (rev 586) +++ trunk/lutinvcs/ui/pom.xml 2008-04-19 08:58:45 UTC (rev 587) @@ -12,7 +12,7 @@ <parent> <groupId>org.codelutin.vcs</groupId> <artifactId>pom</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </parent> <groupId>org.codelutin.vcs.ui</groupId> @@ -34,7 +34,7 @@   <name>ui pom</name> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> <description>Versionning Concurrent System lutin library ui pom</description> <inceptionYear>2008</inceptionYear> @@ -43,14 +43,26 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>lutinlib</groupId> - <artifactId>jaxx</artifactId> - <version>1.0.4-SNAPSHOT</version> + <groupId>org.codelutin.ui</groupId> + <artifactId>lutinui</artifactId> + <version>0.1-SNAPSHOT</version> + <scope>compile</scope> </dependency> + + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>core</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.codelutin.jaxx.provider</groupId> + <artifactId>swing</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency>  <dependency> - <groupId>lutinplugin</groupId> + <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> <version>0.2-SNAPSHOT</version> </dependency>

1 0

r586 - in trunk/lutinjaxx: . core runtime/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org 18 Apr '08

18 Apr '08

Author: tchemit Date: 2008-04-18 21:08:18 +0000 (Fri, 18 Apr 2008) New Revision: 586 Modified: trunk/lutinjaxx/core/pom.xml trunk/lutinjaxx/pom.xml trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/builder/ActionFactory.java Log: suppression de la dependance a lutinui (juste pour une methode helper)... Modified: trunk/lutinjaxx/core/pom.xml =================================================================== --- trunk/lutinjaxx/core/pom.xml 2008-04-18 20:58:50 UTC (rev 585) +++ trunk/lutinjaxx/core/pom.xml 2008-04-18 21:08:18 UTC (rev 586) @@ -35,12 +35,7 @@ </plugins> </build> - <dependencies> - <dependency> - <groupId>org.codelutin.ui</groupId> - <artifactId>lutinui</artifactId> - <scope>compile</scope> - </dependency> + <dependencies>  <dependency> <groupId>com.sun</groupId> Modified: trunk/lutinjaxx/pom.xml =================================================================== --- trunk/lutinjaxx/pom.xml 2008-04-18 20:58:50 UTC (rev 585) +++ trunk/lutinjaxx/pom.xml 2008-04-18 21:08:18 UTC (rev 586) @@ -161,12 +161,8 @@ <artifactId>lutinutil</artifactId> <version>0.31-SNAPSHOT</version> </dependency> + <dependency> - <groupId>org.codelutin.ui</groupId> - <artifactId>lutinui</artifactId> - <version>0.1-SNAPSHOT</version> - </dependency> - <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>core</artifactId> <version>0.1-SNAPSHOT</version> @@ -181,7 +177,7 @@ <artifactId>swing</artifactId> <version>0.1-SNAPSHOT</version> </dependency> -  + <dependency> <groupId>com.sun</groupId> <artifactId>dt</artifactId> @@ -189,7 +185,7 @@ <scope>system</scope> <systemPath>${java.home}/../lib/dt.jar</systemPath> </dependency> -  + <dependency> <groupId>javax.help</groupId> <artifactId>javahelp</artifactId> Modified: trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/builder/ActionFactory.java =================================================================== --- trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-04-18 20:58:50 UTC (rev 585) +++ trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-04-18 21:08:18 UTC (rev 586) @@ -19,7 +19,6 @@ package jaxx.runtime.builder; import jaxx.runtime.JAXXObject; -import org.codelutin.ui.UIHelper; import jaxx.runtime.swing.JAXXToggleButton; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -30,6 +29,7 @@ import javax.swing.Action; import javax.swing.Icon; import javax.swing.JComboBox; +import javax.swing.ImageIcon; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -279,10 +279,10 @@ } if (!anno.smallIcon().isEmpty()) { - result.putValue(Action.SMALL_ICON, UIHelper.createImageIcon(anno.smallIcon())); + result.putValue(Action.SMALL_ICON, createImageIcon(anno.smallIcon())); } if (!anno.smallIcon2().isEmpty()) { - result.putValue(Action.SMALL_ICON + "2", UIHelper.createImageIcon(anno.smallIcon2())); + result.putValue(Action.SMALL_ICON + "2", createImageIcon(anno.smallIcon2())); } if (anno.mnemonic() != '\0') { @@ -315,7 +315,7 @@ result.putValue(Action.SHORT_DESCRIPTION, _(anno.shortDescription())); //} if (!anno.smallIcon().isEmpty()) { - result.putValue(Action.SMALL_ICON, UIHelper.createImageIcon(anno.smallIcon())); + result.putValue(Action.SMALL_ICON, createImageIcon(anno.smallIcon())); } if (anno.mnemonic() != '\0') { result.putValue(Action.MNEMONIC_KEY, anno.mnemonic()); @@ -374,4 +374,13 @@ public Set<Map.Entry<String, AbstractAction>> cacheEntrySet() { return cache.entrySet(); } + + public static ImageIcon createImageIcon(String path) { + java.net.URL imgURL = ActionFactory.class.getResource("/icons/" + path); + if (imgURL != null) { + return new ImageIcon(imgURL); + } else { + throw new RuntimeException("could not find icon " + path); + } + } }

1 0

r585 - in trunk/lutinjaxx: . maven
by tchemit＠users.labs.libre-entreprise.org 18 Apr '08

18 Apr '08

Author: tchemit Date: 2008-04-18 20:58:50 +0000 (Fri, 18 Apr 2008) New Revision: 585 Modified: trunk/lutinjaxx/maven/pom.xml trunk/lutinjaxx/pom.xml Log: maven plugin integrate Modified: trunk/lutinjaxx/maven/pom.xml =================================================================== --- trunk/lutinjaxx/maven/pom.xml 2008-04-18 20:43:00 UTC (rev 584) +++ trunk/lutinjaxx/maven/pom.xml 2008-04-18 20:58:50 UTC (rev 585) @@ -10,28 +10,58 @@  <parent> - <groupId>lutinpom</groupId> - <artifactId>lutinpluginproject</artifactId> - <version>2.3</version> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>pom</artifactId> + <version>0.1-SNAPSHOT</version> </parent> - <groupId>lutinplugin</groupId> <artifactId>maven-jaxx-plugin</artifactId> + <name>maven plugin</name> <dependencies> <dependency> - <groupId>lutinlib</groupId> - <artifactId>jaxx</artifactId> - <version>1.0.4-SNAPSHOT</version> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>core</artifactId> + <version>0.1-SNAPSHOT</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.codelutin.jaxx.provider</groupId> + <artifactId>swing</artifactId> + <version>0.1-SNAPSHOT</version> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>2.0.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>2.0.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.0.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>1.0.5</version> + <scope>compile</scope> + </dependency> </dependencies>    - <name>Maven 2 jaxx compilator plugin</name> <version>0.2-SNAPSHOT</version> <description> @@ -69,7 +99,7 @@    - +  @@ -77,37 +107,4 @@ <url>${maven.scm.url}</url> </scm> - <profiles> - <profile> - <id>project</id> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>user.locale</name> - <value>ISO-8859-15</value> - </property> - </activation> - <properties> - -  - <labs.id>38</labs.id> - -  - <labs.project>buix</labs.project> - -  - <maven.test.skip>false</maven.test.skip> - -  - <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/?root=buix</maven.scm.url> - -  - <maven.scm.developerConnection>scm:svn:svn+ssh:${username}@${labs.host}/svnroot/buix/trunk</maven.scm.developerConnection> - -  - <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/buix/trunk</maven.scm.connection> - - </properties> - </profile> - </profiles> </project> Modified: trunk/lutinjaxx/pom.xml =================================================================== --- trunk/lutinjaxx/pom.xml 2008-04-18 20:43:00 UTC (rev 584) +++ trunk/lutinjaxx/pom.xml 2008-04-18 20:58:50 UTC (rev 585) @@ -22,6 +22,7 @@ <module>core</module> <module>runtime</module> <module>provider</module> + <module>maven</module> </modules> <dependencies> @@ -131,7 +132,7 @@ <artifactId>maven-source-plugin</artifactId> <executions> <execution> - <phase>deploy</phase> + <phase>install</phase> <goals> <goal>jar</goal> </goals>

1 0

r584 - trunk/lutinjaxx
by tchemit＠users.labs.libre-entreprise.org 18 Apr '08

18 Apr '08

Author: tchemit Date: 2008-04-18 20:43:00 +0000 (Fri, 18 Apr 2008) New Revision: 584 Added: trunk/lutinjaxx/maven/ Log: plugin maven comme module de lutinjaxx Copied: trunk/lutinjaxx/maven (from rev 583, trunk/maven-jaxx-plugin)

1 0

r583 - in trunk/lutinjaxx: . core core/src/main/resources/META-INF/services provider provider/swing runtime
by tchemit＠users.labs.libre-entreprise.org 18 Apr '08

18 Apr '08

Author: tchemit Date: 2008-04-18 20:41:04 +0000 (Fri, 18 Apr 2008) New Revision: 583 Modified: trunk/lutinjaxx/core/ trunk/lutinjaxx/core/pom.xml trunk/lutinjaxx/core/src/main/resources/META-INF/services/jaxx.spi.Initializer trunk/lutinjaxx/pom.xml trunk/lutinjaxx/provider/pom.xml trunk/lutinjaxx/provider/swing/pom.xml trunk/lutinjaxx/runtime/pom.xml Log: ne pas utiliser de variable pour la version des modules car cela ne fonctionne pas tres bien... Property changes on: trunk/lutinjaxx/core ___________________________________________________________________ Name: svn:ignore + target Modified: trunk/lutinjaxx/core/pom.xml =================================================================== --- trunk/lutinjaxx/core/pom.xml 2008-04-18 20:16:24 UTC (rev 582) +++ trunk/lutinjaxx/core/pom.xml 2008-04-18 20:41:04 UTC (rev 583) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.jaxx</groupId> <artifactId>pom</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </parent> <artifactId>core</artifactId> <name>core</name> <packaging>jar</packaging> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> <description>Jaxx lutin library core</description> <build> @@ -34,4 +34,22 @@ </plugin--> </plugins> </build> + + <dependencies> + <dependency> + <groupId>org.codelutin.ui</groupId> + <artifactId>lutinui</artifactId> + <scope>compile</scope> + </dependency> +  + <dependency> + <groupId>com.sun</groupId> + <artifactId>dt</artifactId> + </dependency> +  + <dependency> + <groupId>javax.help</groupId> + <artifactId>javahelp</artifactId> + </dependency> + </dependencies> </project> Modified: trunk/lutinjaxx/core/src/main/resources/META-INF/services/jaxx.spi.Initializer =================================================================== --- trunk/lutinjaxx/core/src/main/resources/META-INF/services/jaxx.spi.Initializer 2008-04-18 20:16:24 UTC (rev 582) +++ trunk/lutinjaxx/core/src/main/resources/META-INF/services/jaxx.spi.Initializer 2008-04-18 20:41:04 UTC (rev 583) @@ -1 +1 @@ -jaxx.tags.swing.SwingInitializer \ No newline at end of file +jaxx.DefaultInitializer \ No newline at end of file Modified: trunk/lutinjaxx/pom.xml =================================================================== --- trunk/lutinjaxx/pom.xml 2008-04-18 20:16:24 UTC (rev 582) +++ trunk/lutinjaxx/pom.xml 2008-04-18 20:41:04 UTC (rev 583) @@ -35,7 +35,7 @@   <name>pom</name> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> <description>Jaxx lutin library main pom</description> <inceptionYear>2008</inceptionYear> @@ -54,9 +54,6 @@ <labs.project>buix</labs.project> -  - <current.version>0.1-SNAPSHOT</current.version> -    @@ -171,17 +168,17 @@ <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>core</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>runtime</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.codelutin.jaxx.provider</groupId> <artifactId>swing</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </dependency>  <dependency> Modified: trunk/lutinjaxx/provider/pom.xml =================================================================== --- trunk/lutinjaxx/provider/pom.xml 2008-04-18 20:16:24 UTC (rev 582) +++ trunk/lutinjaxx/provider/pom.xml 2008-04-18 20:41:04 UTC (rev 583) @@ -12,7 +12,7 @@ <parent> <groupId>org.codelutin.jaxx</groupId> <artifactId>pom</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </parent> <groupId>org.codelutin.jaxx.provider</groupId> @@ -25,7 +25,7 @@ <dependencies> <dependency> <groupId>org.codelutin.jaxx</groupId> - <artifactId>core</artifactId> + <artifactId>runtime</artifactId> </dependency> </dependencies> @@ -33,21 +33,10 @@   <name>provider pom</name> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> <description>Jaxx lutin library provider pom</description> <inceptionYear>2008</inceptionYear> <packaging>pom</packaging> - - <dependencyManagement> - <dependencies> -  - </dependencies> - </dependencyManagement> - + </project> Modified: trunk/lutinjaxx/provider/swing/pom.xml =================================================================== --- trunk/lutinjaxx/provider/swing/pom.xml 2008-04-18 20:16:24 UTC (rev 582) +++ trunk/lutinjaxx/provider/swing/pom.xml 2008-04-18 20:41:04 UTC (rev 583) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.jaxx.provider</groupId> <artifactId>pom</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </parent> <artifactId>swing</artifactId> <name>provider swing</name> <packaging>jar</packaging> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> <description>Jaxx library swing provider</description> <build> @@ -36,20 +36,6 @@ </build> <dependencies> - <dependency> - <groupId>org.codelutin.jaxx.provider</groupId> - <artifactId>default</artifactId> - <scope>compile</scope> - </dependency> -  + </dependencies> </project> Modified: trunk/lutinjaxx/runtime/pom.xml =================================================================== --- trunk/lutinjaxx/runtime/pom.xml 2008-04-18 20:16:24 UTC (rev 582) +++ trunk/lutinjaxx/runtime/pom.xml 2008-04-18 20:41:04 UTC (rev 583) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.jaxx</groupId> <artifactId>pom</artifactId> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> </parent> <artifactId>runtime</artifactId> <name>runtime</name> <packaging>jar</packaging> - <version>${current.version}</version> + <version>0.1-SNAPSHOT</version> <description>Jaxx lutin library runtime</description> <build> @@ -41,19 +41,5 @@ <artifactId>core</artifactId> <scope>compile</scope> </dependency> -  - <dependency> - <groupId>com.sun</groupId> - <artifactId>dt</artifactId> -  - </dependency> -  - <dependency> - <groupId>javax.help</groupId> - <artifactId>javahelp</artifactId> -  - </dependency> </dependencies> </project>

1 0

r582 - trunk/lutinjaxx/runtime
by tchemit＠users.labs.libre-entreprise.org 18 Apr '08

18 Apr '08

Author: tchemit Date: 2008-04-18 20:16:24 +0000 (Fri, 18 Apr 2008) New Revision: 582 Modified: trunk/lutinjaxx/runtime/ Log: svn ignore Property changes on: trunk/lutinjaxx/runtime ___________________________________________________________________ Name: svn:ignore + target

1 0

r581 - in trunk/lutinjaxx/runtime/src: main/java/jaxx/runtime test/java/jaxx/runtime
by tchemit＠users.labs.libre-entreprise.org 18 Apr '08

18 Apr '08

Author: tchemit Date: 2008-04-18 20:13:49 +0000 (Fri, 18 Apr 2008) New Revision: 581 Added: trunk/lutinjaxx/runtime/src/test/java/jaxx/runtime/UtilTest.java Removed: trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/UtilTest.java Log: test at good place Deleted: trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/UtilTest.java =================================================================== --- trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/UtilTest.java 2008-04-18 20:13:07 UTC (rev 580) +++ trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/UtilTest.java 2008-04-18 20:13:49 UTC (rev 581) @@ -1,25 +0,0 @@ -package jaxx.runtime; - -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; - -public class UtilTest extends junit.framework.TestCase { - private int count; - - - public void testGetEventListener() { - count = 0; - DocumentListener listener = (DocumentListener) jaxx.runtime.Util.getEventListener(javax.swing.event.DocumentListener.class, this, "incCount"); - listener.insertUpdate(null); - assertEquals(count, 1); - DocumentListener listener2 = (DocumentListener) jaxx.runtime.Util.getEventListener(javax.swing.event.DocumentListener.class, this, "incCount"); - listener2.removeUpdate(null); - assertEquals(count, 2); - //assertTrue("Received two different event listeners despite using identical parameters", listener == listener2); - } - - - public void incCount(DocumentEvent e) { - count++; - } -} \ No newline at end of file Copied: trunk/lutinjaxx/runtime/src/test/java/jaxx/runtime/UtilTest.java (from rev 580, trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/UtilTest.java) =================================================================== --- trunk/lutinjaxx/runtime/src/test/java/jaxx/runtime/UtilTest.java (rev 0) +++ trunk/lutinjaxx/runtime/src/test/java/jaxx/runtime/UtilTest.java 2008-04-18 20:13:49 UTC (rev 581) @@ -0,0 +1,25 @@ +package jaxx.runtime; + +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; + +public class UtilTest extends junit.framework.TestCase { + private int count; + + + public void testGetEventListener() { + count = 0; + DocumentListener listener = (DocumentListener) jaxx.runtime.Util.getEventListener(javax.swing.event.DocumentListener.class, this, "incCount"); + listener.insertUpdate(null); + assertEquals(count, 1); + DocumentListener listener2 = (DocumentListener) jaxx.runtime.Util.getEventListener(javax.swing.event.DocumentListener.class, this, "incCount"); + listener2.removeUpdate(null); + assertEquals(count, 2); + //assertTrue("Received two different event listeners despite using identical parameters", listener == listener2); + } + + + public void incCount(DocumentEvent e) { + count++; + } +} \ No newline at end of file

1 0

r580 - in trunk/lutinjaxx: core/src/test/java/jaxx/runtime runtime/src/main/java/jaxx/runtime
by tchemit＠users.labs.libre-entreprise.org 18 Apr '08

18 Apr '08

Author: tchemit Date: 2008-04-18 20:13:07 +0000 (Fri, 18 Apr 2008) New Revision: 580 Added: trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/UtilTest.java Removed: trunk/lutinjaxx/core/src/test/java/jaxx/runtime/UtilTest.java Log: test at good place Deleted: trunk/lutinjaxx/core/src/test/java/jaxx/runtime/UtilTest.java =================================================================== --- trunk/lutinjaxx/core/src/test/java/jaxx/runtime/UtilTest.java 2008-04-18 20:12:46 UTC (rev 579) +++ trunk/lutinjaxx/core/src/test/java/jaxx/runtime/UtilTest.java 2008-04-18 20:13:07 UTC (rev 580) @@ -1,25 +0,0 @@ -package jaxx.runtime; - -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; - -public class UtilTest extends junit.framework.TestCase { - private int count; - - - public void testGetEventListener() { - count = 0; - DocumentListener listener = (DocumentListener) jaxx.runtime.Util.getEventListener(javax.swing.event.DocumentListener.class, this, "incCount"); - listener.insertUpdate(null); - assertEquals(count, 1); - DocumentListener listener2 = (DocumentListener) jaxx.runtime.Util.getEventListener(javax.swing.event.DocumentListener.class, this, "incCount"); - listener2.removeUpdate(null); - assertEquals(count, 2); - //assertTrue("Received two different event listeners despite using identical parameters", listener == listener2); - } - - - public void incCount(DocumentEvent e) { - count++; - } -} \ No newline at end of file Copied: trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/UtilTest.java (from rev 579, trunk/lutinjaxx/core/src/test/java/jaxx/runtime/UtilTest.java) =================================================================== --- trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/UtilTest.java (rev 0) +++ trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/UtilTest.java 2008-04-18 20:13:07 UTC (rev 580) @@ -0,0 +1,25 @@ +package jaxx.runtime; + +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; + +public class UtilTest extends junit.framework.TestCase { + private int count; + + + public void testGetEventListener() { + count = 0; + DocumentListener listener = (DocumentListener) jaxx.runtime.Util.getEventListener(javax.swing.event.DocumentListener.class, this, "incCount"); + listener.insertUpdate(null); + assertEquals(count, 1); + DocumentListener listener2 = (DocumentListener) jaxx.runtime.Util.getEventListener(javax.swing.event.DocumentListener.class, this, "incCount"); + listener2.removeUpdate(null); + assertEquals(count, 2); + //assertTrue("Received two different event listeners despite using identical parameters", listener == listener2); + } + + + public void incCount(DocumentEvent e) { + count++; + } +} \ No newline at end of file

1 0