- Jaxx-commits - mailman.cloud.codelutin.com

[Buix-commits] r277 - in trunk/lutinvcs/lutinvcs-ui: . src/main src/main/java src/test/java/org/codelutin/vcs/ui src/test/resources
by tchemit＠users.labs.libre-entreprise.org April 1, 2008

April 1, 2008

Author: tchemit Date: 2008-04-01 02:27:48 +0000 (Tue, 01 Apr 2008) New Revision: 277 Removed: trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/ Modified: trunk/lutinvcs/lutinvcs-ui/pom.xml trunk/lutinvcs/lutinvcs-ui/src/main/java/ trunk/lutinvcs/lutinvcs-ui/src/test/java/org/codelutin/vcs/ui/UITest.java trunk/lutinvcs/lutinvcs-ui/src/test/resources/log4j.properties Log: ui-jaxx module Modified: trunk/lutinvcs/lutinvcs-ui/pom.xml =================================================================== --- trunk/lutinvcs/lutinvcs-ui/pom.xml 2008-04-01 02:27:15 UTC (rev 276) +++ trunk/lutinvcs/lutinvcs-ui/pom.xml 2008-04-01 02:27:48 UTC (rev 277) @@ -25,56 +25,7 @@ <build> <plugins> <plugin> -  - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>clean</phase> - <configuration> - <tasks> - <delete includeemptydirs="true"> - <fileset dir="${maven.src.dir}/main/java" includes="**/*"/> - </delete> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>lutinplugin</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <version>0.2-SNAPSHOT</version> - <configuration> - <src>${maven.src.dir}/main/uimodel</src> - <out>${maven.src.dir}/main/java</out> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> -  - <dependency> - <groupId>lutinlib.vcs</groupId> -  - <artifactId>lutinvcs-core</artifactId> - <scope>compile</scope> - <version>${current.version}</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>lutinplugin</groupId> <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> @@ -98,6 +49,11 @@ </dependency> <dependency> <groupId>lutinlib.vcs</groupId> + <artifactId>lutinvcs-ui-jaxx</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>lutinlib.vcs</groupId> <artifactId>lutinvcs-provider-mock</artifactId> <scope>compile</scope> </dependency> Property changes on: trunk/lutinvcs/lutinvcs-ui/src/main/java ___________________________________________________________________ Name: svn:ignore - org org/* Modified: trunk/lutinvcs/lutinvcs-ui/src/test/java/org/codelutin/vcs/ui/UITest.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/test/java/org/codelutin/vcs/ui/UITest.java 2008-04-01 02:27:15 UTC (rev 276) +++ trunk/lutinvcs/lutinvcs-ui/src/test/java/org/codelutin/vcs/ui/UITest.java 2008-04-01 02:27:48 UTC (rev 277) @@ -42,10 +42,14 @@ VCSHandler handler = VCSHandlerFactory.getHandler(); - VCSSynchUI dialog = new VCSSynchUI(); + SynchUI dialog = new SynchUI(); + + //uiHandler.init(); fillSynchModel(handler, dialog.getModel(), 20, "trunk", "local/", "remote/"); + SynchUIHandlerImpl uiHandler = new SynchUIHandlerImpl(dialog); + uiHandler.init(); - dialog.setVisible(true); + dialog.getUi().setVisible(true); } protected static void fillSynchModel(VCSHandler handler, SynchUIModel model, int max, String prefix, String localPRefix, String remotePrefix) { Modified: trunk/lutinvcs/lutinvcs-ui/src/test/resources/log4j.properties =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/test/resources/log4j.properties 2008-04-01 02:27:15 UTC (rev 276) +++ trunk/lutinvcs/lutinvcs-ui/src/test/resources/log4j.properties 2008-04-01 02:27:48 UTC (rev 277) @@ -6,6 +6,4 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n #log4j.appender.stdout.layout.ConversionPattern=%%c=%c %%C=%C %%d=%d %%F=%F %%l=%l %%L=%L %%m=%m %%M=%M %%p=%p %%r=%r %%t=%t %%x=%x %%X=%X # package level -log4j.logger.org.codelutin.i18n=INFO -log4j.logger.org.codelutin.util=INFO -log4j.logger.org.codelutin.option=INFO +log4j.logger.org.codelutin=INFO

1 0

[Buix-commits] r276 - trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org April 1, 2008

April 1, 2008

Author: tchemit Date: 2008-04-01 02:27:15 +0000 (Tue, 01 Apr 2008) New Revision: 276 Removed: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/SynchUIHandlerImpl.java Log: ui-jaxx module Deleted: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/SynchUIHandlerImpl.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/SynchUIHandlerImpl.java 2008-04-01 02:26:35 UTC (rev 275) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/SynchUIHandlerImpl.java 2008-04-01 02:27:15 UTC (rev 276) @@ -1,50 +0,0 @@ -package org.codelutin.vcs.ui; - -import org.codelutin.vcs.VCSAction; -import org.codelutin.vcs.ui.model.SynchUIHandler; -import org.codelutin.vcs.ui.model.SynchUIModel; -import org.codelutin.vcs.ui.model.SynchVCSFileStatesModel; - -import java.beans.PropertyChangeEvent; -import java.util.ArrayList; -import java.util.List; - -/** @author chemit */ -public class SynchUIHandlerImpl extends SynchUIHandler { - - final SynchUI ui; - - public SynchUIHandlerImpl(SynchUI ui) { - this.ui = ui; - } - - public void init() { - super.init(); - this.ui.selectTab(VCSUIConstants.ALL_MODEL_PROPERTY); - } - - - @Override - public void propertyChange(PropertyChangeEvent evt) { - super.propertyChange(evt); - SynchVCSFileStatesModel model = (SynchVCSFileStatesModel) evt.getNewValue(); - - String tabModelName = ui.getModel().getTabModelName(model); - ui.cardLayout.show(ui.preview, tabModelName); - VCSAction[] actions = model.getActions(); - List<String> acts = new ArrayList<String>(); - for (VCSAction action : actions) { - acts.add(action.name().toLowerCase()); - } - boolean hasActions = actions.length > 0; - ui.getDiffAll().setEnabled(hasActions && acts.contains("diff")); - ui.getUpdateAll().setEnabled(hasActions && acts.contains("update")); - ui.getCommitAll().setEnabled(hasActions && acts.contains("commit")); - ui.getRevertAll().setEnabled(hasActions && acts.contains("revert")); - ui.getRefresh().setEnabled(hasActions); - } - - public SynchUIModel getModel() { - return ui.getModel(); - } -}

1 0

[Buix-commits] r275 - in trunk/lutinvcs/lutinvcs-ui/src/main/java: . org org/codelutin org/codelutin/vcs org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org April 1, 2008

April 1, 2008

Author: tchemit Date: 2008-04-01 02:26:35 +0000 (Tue, 01 Apr 2008) New Revision: 275 Added: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandlerImpl.java Log: ui-jaxx module Added: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandlerImpl.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandlerImpl.java (rev 0) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandlerImpl.java 2008-04-01 02:26:35 UTC (rev 275) @@ -0,0 +1,50 @@ +package org.codelutin.vcs.ui; + +import org.codelutin.vcs.VCSAction; +import org.codelutin.vcs.ui.model.SynchUIHandler; +import org.codelutin.vcs.ui.model.SynchUIModel; +import org.codelutin.vcs.ui.model.SynchVCSFileStatesModel; + +import java.beans.PropertyChangeEvent; +import java.util.ArrayList; +import java.util.List; + +/** @author chemit */ +public class SynchUIHandlerImpl extends SynchUIHandler { + + final SynchUI ui; + + public SynchUIHandlerImpl(SynchUI ui) { + this.ui = ui; + } + + public void init() { + super.init(); + this.ui.selectTab(VCSUIConstants.ALL_MODEL_PROPERTY); + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { + super.propertyChange(evt); + + SynchVCSFileStatesModel model = (SynchVCSFileStatesModel) evt.getNewValue(); + + String tabModelName = ui.getModel().getTabModelName(model); + ui.cardLayout.show(ui.preview, tabModelName); + VCSAction[] actions = model.getActions(); + List<String> acts = new ArrayList<String>(); + for (VCSAction action : actions) { + acts.add(action.name().toLowerCase()); + } + boolean hasActions = actions.length > 0; + ui.getDiffAll().setEnabled(hasActions && acts.contains("diff")); + ui.getUpdateAll().setEnabled(hasActions && acts.contains("update")); + ui.getCommitAll().setEnabled(hasActions && acts.contains("commit")); + ui.getRevertAll().setEnabled(hasActions && acts.contains("revert")); + ui.getRefresh().setEnabled(hasActions); + } + + public SynchUIModel getModel() { + return ui.getModel(); + } +}

1 0

[Buix-commits] r274 - trunk/lutinvcs/lutinvcs-ui/src/main/resources
by tchemit＠users.labs.libre-entreprise.org April 1, 2008

April 1, 2008

Author: tchemit Date: 2008-04-01 02:26:25 +0000 (Tue, 01 Apr 2008) New Revision: 274 Removed: trunk/lutinvcs/lutinvcs-ui/src/main/resources/icons/ Log: ui-jaxx module

1 0

[Buix-commits] r273 - in trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui: . action model
by tchemit＠users.labs.libre-entreprise.org April 1, 2008

April 1, 2008

Author: tchemit Date: 2008-04-01 02:26:00 +0000 (Tue, 01 Apr 2008) New Revision: 273 Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSAbsractAction.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSSynchAction.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIHandler.java Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/AbstractVCSFileStatesModel.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java Log: ui-jaxx module Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSAbsractAction.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSAbsractAction.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSAbsractAction.java 2008-04-01 02:26:00 UTC (rev 273) @@ -0,0 +1,36 @@ +/** + * # #% Copyright (C) 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 org.codelutin.vcs.ui.action; + +import org.codelutin.vcs.VCSAction; +import org.codelutin.vcs.VCSHandler; + +import javax.swing.AbstractAction; + +/** @author chemit */ +public abstract class VCSAbsractAction extends AbstractAction { + + protected final VCSAction action; + + protected transient VCSHandler handler; + + private static final long serialVersionUID = 1074145285171920255L; + + public VCSAbsractAction(VCSHandler handler, VCSAction action) { + this.handler = handler; + this.action = action; + } + +} Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSSynchAction.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSSynchAction.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSSynchAction.java 2008-04-01 02:26:00 UTC (rev 273) @@ -0,0 +1,37 @@ +/** + * # #% Copyright (C) 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 org.codelutin.vcs.ui.action; + +import org.codelutin.vcs.VCSAction; +import org.codelutin.vcs.ui.model.SynchUIHandler; + +import java.awt.event.ActionEvent; + +/** @author chemit */ +public class VCSSynchAction extends VCSAbsractAction { + + private static final long serialVersionUID = 5214785331070517352L; + + protected transient SynchUIHandler uiHandler; + + public VCSSynchAction(SynchUIHandler uiHandler, VCSAction action) { + super(uiHandler.getModel().getHandler(), action); + this.uiHandler = uiHandler; + } + + public void actionPerformed(ActionEvent e) { + + } +} Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/AbstractVCSFileStatesModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/AbstractVCSFileStatesModel.java 2008-04-01 02:25:29 UTC (rev 272) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/AbstractVCSFileStatesModel.java 2008-04-01 02:26:00 UTC (rev 273) @@ -168,12 +168,15 @@ return new VCSAction[0]; } List<VCSAction> result = new ArrayList<VCSAction>(); - for (VCSFileState vcsFileState : data) { - VCSAction action = vcsFileState.getAction(); - if (action != null && !result.contains(action)) { - result.add(action); + for (VCSState vcsFileState : getStates()) { + List<VCSAction> action = vcsFileState.getActions(); + for (VCSAction vcsAction : action) { + if (vcsAction != null && !result.contains(vcsAction)) { + result.add(vcsAction); + } } } return result.toArray(new VCSAction[result.size()]); } + } \ No newline at end of file Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIHandler.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIHandler.java 2008-04-01 02:26:00 UTC (rev 273) @@ -0,0 +1,62 @@ +/** + * # #% Copyright (C) 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 org.codelutin.vcs.ui.model; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + +/** @author chemit */ +public abstract class SynchUIHandler implements PropertyChangeListener { + + protected static Log log = LogFactory.getLog(SynchUIHandler.class); + + public void propertyChange(PropertyChangeEvent evt) { + //if (log.isDebugEnabled()) { + log.info(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); + //} + + } + + protected SynchUIHandler() { + } + + public abstract SynchUIModel getModel(); + + public void init() { + if (getModel() == null) { + throw new IllegalStateException("no model was defined for " + this); + } + getModel().addPropertyChangeListener(SynchUIModel.TAB_PROPERTY_CHANGED, this); + } + + public void dispatchAction(String action) { + if (action.endsWith("All")) { + doAllAction(action.substring(0, action.length() - 3)); + } else { + doSelectAction(action); + } + } + + protected void doSelectAction(String action) { + log.info(action); + } + + protected void doAllAction(String action) { + log.info(action); + } +} Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java 2008-04-01 02:25:29 UTC (rev 272) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java 2008-04-01 02:26:00 UTC (rev 273) @@ -18,15 +18,19 @@ import org.apache.commons.logging.LogFactory; import org.codelutin.vcs.VCSFileState; import org.codelutin.vcs.VCSHandler; +import org.codelutin.vcs.VCSAction; import static org.codelutin.vcs.ui.VCSUIConstants.ALL_MODEL_PROPERTY; import static org.codelutin.vcs.ui.VCSUIConstants.LOCAL_MODEL_PROPERTY; import static org.codelutin.vcs.ui.VCSUIConstants.REMOTE_MODEL_PROPERTY; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; import java.io.File; import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; /** @@ -39,6 +43,25 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static protected final Log log = LogFactory.getLog(SynchUIModel.class); + /** la propri�t� pour indiquer un changement de racine d'arbre */ + public static final String TAB_PROPERTY_CHANGED = "tab"; + + public static final String DIFF_ALL_PROPERTY_CHANGED = "diffAll"; + + public static final String COMMIT_ALL_PROPERTY_CHANGED = "commitAll"; + + public static final String UPDATE_ALL_PROPERTY_CHANGED = "updateAll"; + + public static final String REVERT_ALL_PROPERTY_CHANGED = "revertAll"; + + public static final String DIFF_PROPERTY_CHANGED = "diff"; + + public static final String COMMIT_PROPERTY_CHANGED = "commit"; + + public static final String UPDATE_PROPERTY_CHANGED = "update"; + + public static final String REVERT_PROPERTY_CHANGED = "revert"; + /** local root : wroking copy */ protected File localRoot; @@ -51,6 +74,14 @@ /** map of models */ protected Map<String, SynchVCSFileStatesModel> models; + /** support for change properties support */ + protected PropertyChangeSupport changeSupport; + + /** current tab displayed */ + protected AbstractVCSFileStatesModel tabModel; + /** current action to fired */ + protected VCSAction action; + public SynchUIModel() { } @@ -60,6 +91,33 @@ this.remoteRoot = remoteRoot; } + public VCSHandler getHandler() { + return handler; + } + + public AbstractVCSFileStatesModel getTabModel() { + return tabModel; + } + + public void setTabModel(AbstractVCSFileStatesModel tabModel) { + AbstractVCSFileStatesModel oldTabModel = this.tabModel; + this.tabModel = tabModel; + firePropertyChange(TAB_PROPERTY_CHANGED, oldTabModel, tabModel); + } + + public AbstractVCSFileStatesModel getTabModel(String tabModel) { + return getModel(tabModel); + } + + public String getTabModelName(AbstractVCSFileStatesModel model) { + for (Entry<String, SynchVCSFileStatesModel> entry : models.entrySet()) { + if (model.equals(entry.getValue())) { + return entry.getKey(); + } + } + return null; + } + public void setLocalRoot(File localRoot) { this.localRoot = localRoot; } @@ -103,6 +161,65 @@ getModel(REMOTE_MODEL_PROPERTY).removeData(remote.toArray(new VCSFileState[remote.size()])); } + public void doAllAction(VCSAction action) { + if (tabModel == null) { + return; + } + this.action = action; + firePropertyChange(action.name().toLowerCase() + "All", null, tabModel); + } + + public synchronized void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + if (listener == null) { + return; + } + if (changeSupport == null) { + changeSupport = new PropertyChangeSupport(this); + } + changeSupport.addPropertyChangeListener(propertyName, listener); + } + + public synchronized void addPropertyChangeListener(PropertyChangeListener listener) { + if (listener == null) { + return; + } + if (changeSupport == null) { + changeSupport = new PropertyChangeSupport(this); + } + changeSupport.addPropertyChangeListener(listener); + } + + public synchronized void removePropertyChangeListener(PropertyChangeListener listener) { + if (listener == null || changeSupport == null) { + return; + } + changeSupport.removePropertyChangeListener(listener); + } + + public synchronized void removePropertyChangeListeners() { + if (changeSupport == null) { + return; + } + for (PropertyChangeListener listener : getPropertyChangeListeners()) { + changeSupport.removePropertyChangeListener(listener); + } + } + + public synchronized PropertyChangeListener[] getPropertyChangeListeners() { + if (changeSupport == null) { + return new PropertyChangeListener[0]; + } + return changeSupport.getPropertyChangeListeners(); + } + + public void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + if (changeSupport == null || (oldValue == null && newValue == null) || + (oldValue != null && oldValue.equals(newValue))) { + return; + } + changeSupport.firePropertyChange(propertyName, oldValue, newValue); + } + protected Map<String, SynchVCSFileStatesModel> getModels() { if (models == null) { models = new TreeMap<String, SynchVCSFileStatesModel>();

1 0

[Buix-commits] r272 - trunk/lutinvcs
by tchemit＠users.labs.libre-entreprise.org April 1, 2008

April 1, 2008

Author: tchemit Date: 2008-04-01 02:25:29 +0000 (Tue, 01 Apr 2008) New Revision: 272 Modified: trunk/lutinvcs/pom.xml Log: ui-jaxx module Modified: trunk/lutinvcs/pom.xml =================================================================== --- trunk/lutinvcs/pom.xml 2008-04-01 02:24:14 UTC (rev 271) +++ trunk/lutinvcs/pom.xml 2008-04-01 02:25:29 UTC (rev 272) @@ -24,6 +24,7 @@ <module>lutinvcs-provider-mock</module> <module>lutinvcs-provider-cvs</module> <module>lutinvcs-provider-svn</module> + <module>lutinvcs-ui-jaxx</module> <module>lutinvcs-ui</module> </modules> @@ -214,6 +215,11 @@ </dependency> <dependency> <groupId>lutinlib.vcs</groupId> + <artifactId>lutinvcs-ui-jaxx</artifactId> + <version>${current.version}</version> + </dependency> + <dependency> + <groupId>lutinlib.vcs</groupId> <artifactId>lutinvcs-ui</artifactId> <version>${current.version}</version> </dependency> @@ -232,11 +238,11 @@ <artifactId>lutinvcs-provider-svn</artifactId> <version>${current.version}</version> </dependency> - <dependency> +  <dependency> <groupId>commons-lang</groupId>

1 0

April 1, 2008

Author: tchemit Date: 2008-04-01 02:24:14 +0000 (Tue, 01 Apr 2008) New Revision: 271 Added: trunk/lutinvcs/lutinvcs-ui-jaxx/ trunk/lutinvcs/lutinvcs-ui-jaxx/LICENSE.txt trunk/lutinvcs/lutinvcs-ui-jaxx/changelog trunk/lutinvcs/lutinvcs-ui-jaxx/pom.xml trunk/lutinvcs/lutinvcs-ui-jaxx/src/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/java/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-en_GB.properties trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-fr_FR.properties trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/AddRemove_C32.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/advanced.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/autoRefresh.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/autorefresh-icon.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/clearFilter.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/commit.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/compileSingle.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/conflicts-badge.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/cut.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/diff-next.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/diff-prev.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/diff.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/diff_file_16.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/envelope_small.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/export.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/filter.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/find_next.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/find_previous.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/find_selection.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/generalOptions.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/import-elements.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/local_vs_local.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/locally_mod.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/loop.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/modified-badge.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/newFile24.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/password_field_32.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/paste.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/recent_messages.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/recent_msgs.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/refresh.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remote_vs_local.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remote_vs_remote.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/rollback.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/save.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/save24.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/search_types.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/search_types_disabled.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/server.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/update.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/versioning-view.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/SynchUIHandlerImpl.java trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/common.css trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/fr/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/fr/rst/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/fr/rst/devel/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/fr/rst/devel/index.rst trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/fr/rst/index.rst trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/fr/rst/todo.rst trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/site_fr.xml trunk/lutinvcs/lutinvcs-ui-jaxx/src/test/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/test/java/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/test/resources/ trunk/lutinvcs/lutinvcs-ui-jaxx/src/test/resources/log4j.properties Log: ui-jaxx module Added: trunk/lutinvcs/lutinvcs-ui-jaxx/LICENSE.txt =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/LICENSE.txt (rev 0) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/LICENSE.txt 2008-04-01 02:24:14 UTC (rev 271) @@ -0,0 +1,280 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS Added: trunk/lutinvcs/lutinvcs-ui-jaxx/changelog =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/changelog (rev 0) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/changelog 2008-04-01 02:24:14 UTC (rev 271) @@ -0,0 +1,57 @@ +ver-0-26 poussin 2007???? + * bug in concat(Object [] ...), better array type now work + * add unaccent in StringUtil + +ver-0-25 poussin 20070425 + * add StringUtil.toArrayXXX(String ... s) methodes + * use generic + +ver-0-24 poussin + * ArgumentsParser have 1 as repetitionMax by default + * ArgumentsParser use jdk 1.5 syntaxe (..., <>) + +ver-0-23 poussin 20061004 + * move i18n in lutinutil + * add method Resource.getConfigProperties(String, Properties) to chains + properties + +ver-0-22 poussin 20060913 + * use Generics in CategorisedListenerSet + * add org.codelutin.log package (LutinLog, ...) + * remove org.codelutin.util.Log + +ver-0-21 poussin 20060907 + + * Add TransformedList + * Add FileUtil.getTempFile(String):File + * add FileUtil.getFile():File that prompt user + * add FileUtil.getDirectory(): String that prompt user + * add FileUtil.copyRecursively(File, File, String ... patternFilter) + * add ZipUtil class to compress/uncompress zip file + * Transparente*Reference accept null object + +ver-0-17 thimel 20050610 + + * Ajout de BoundedList et BoundedListOutOfBoundsException + +ver-0-16 poussin 20050526 + + * Ajout de la methode getConfigProperties dans Resource + +ver-0-9 poussin 20040728 + + * Ajout de methode isJar, isZip, dans Resource + +ver-0-3 poussin 20040405 + + * utilisation de maven pour la gestion du projet + * Ajout de ExceptionUtil + +ver-0-2 poussin 20031021 + + * ajout du parser d'argument, ArgumentsParser + * ajout de StringUtil + +ver-0-1 + + * premier version contient seulement Resource Added: trunk/lutinvcs/lutinvcs-ui-jaxx/pom.xml =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/pom.xml (rev 0) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/pom.xml 2008-04-01 02:24:14 UTC (rev 271) @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<project 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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>lutinlib.vcs</groupId> + <artifactId>lutinvcs</artifactId> + <version>0.1-SNAPSHOT</version> + </parent> + + <artifactId>lutinvcs-ui-jaxx</artifactId> + <name>Lutinvcs ui jaxx</name> + + <packaging>jar</packaging> + <version>0.1-SNAPSHOT</version> + <description>Librairy of VCS ui generated by jaxx</description> + + <properties> +  +  + </properties> + + <build> + <plugins> + <plugin> +  + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>clean</phase> + <configuration> + <tasks> + <delete includeemptydirs="true"> + <fileset dir="${maven.src.dir}/main/java" includes="**/*"/> + </delete> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>0.2-SNAPSHOT</version> + <configuration> + <src>${maven.src.dir}/main/uimodel</src> + <out>${maven.src.dir}/main/java</out> + </configuration> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> +  + <dependency> + <groupId>lutinlib.vcs</groupId> +  + <artifactId>lutinvcs-core</artifactId> + <scope>compile</scope> + <version>${current.version}</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <phase>process-classes</phase> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +  + <dependencies> + <dependency> + <groupId>lutinlib.vcs</groupId> + <artifactId>lutinvcs-core</artifactId> + <scope>compile</scope> + </dependency> +  +  + <dependency> + <groupId>lutinlib</groupId> + <artifactId>jaxx</artifactId> + <scope>compile</scope> + </dependency> + </dependencies> + +</project> Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-en_GB.properties =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-en_GB.properties (rev 0) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-en_GB.properties 2008-04-01 02:24:14 UTC (rev 271) @@ -0,0 +1,26 @@ +lutinvcs.action.commit=commit +lutinvcs.action.commitAll=commit all +lutinvcs.action.diff=diff +lutinvcs.action.diffAll=diff all +lutinvcs.action.refresh= +lutinvcs.action.revert=revert selected files +lutinvcs.action.revertAll=revert all files +lutinvcs.action.tooltip.commit=commit selected files +lutinvcs.action.tooltip.commitAll=commit all files +lutinvcs.action.tooltip.diff=show diff for selected files +lutinvcs.action.tooltip.diffAll=show diff of all files +lutinvcs.action.tooltip.refresh=refresh selected files +lutinvcs.action.tooltip.revert=revert selected files +lutinvcs.action.tooltip.revertAll=revert all files +lutinvcs.action.tooltip.update=update selected files +lutinvcs.action.tooltip.updateAll=update all files +lutinvcs.action.update=update +lutinvcs.action.updateAll=update all +lutinvcs.quit=Quit +lutinvcs.synch.title=Synch +lutinvcs.tabs.all=all +lutinvcs.tabs.local=local +lutinvcs.tabs.remote=remote +lutinvcs.tabs.tooltip.all=Show all files (local and remote) +lutinvcs.tabs.tooltip.local=Show all local files +lutinvcs.tabs.tooltip.remote=Show all remote files Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-fr_FR.properties =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-fr_FR.properties (rev 0) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-fr_FR.properties 2008-04-01 02:24:14 UTC (rev 271) @@ -0,0 +1,26 @@ +lutinvcs.action.commit=commit +lutinvcs.action.commitAll=tout commiter +lutinvcs.action.diff=diff +lutinvcs.action.diffAll=voir tous les diffs +lutinvcs.action.refresh= +lutinvcs.action.revert=revert +lutinvcs.action.revertAll=annuler les modifications +lutinvcs.action.tooltip.commit=commiter les fichiers s\u00E9lectionn\u00E9s +lutinvcs.action.tooltip.commitAll=commiter tous les fichiers +lutinvcs.action.tooltip.diff=voir les diff\u00E9rences des fichiers s\u00E9lectionn\u00E9s +lutinvcs.action.tooltip.diffAll=voir les diff\u00E9rences de tous les fichiers +lutinvcs.action.tooltip.refresh=rafra\u00EEchir +lutinvcs.action.tooltip.revert=annuler les modifications sur les fichiers s\u00E9lectionn\u00E9s +lutinvcs.action.tooltip.revertAll=annuller les modifications sur tous les fichiers +lutinvcs.action.tooltip.update=mettre \u00E0 jour les fichiers s\u00E9lectionn\u00E9s +lutinvcs.action.tooltip.updateAll=mettre \u00E0 jour tous les fichiers +lutinvcs.action.update=update +lutinvcs.action.updateAll=tout mettre \u00E0 jour +lutinvcs.quit=Quitter +lutinvcs.synch.title=Synchronisation +lutinvcs.tabs.all=all +lutinvcs.tabs.local=local +lutinvcs.tabs.remote=remote +lutinvcs.tabs.tooltip.all=voir tous les fichiers modifi\u00E9s localement ou \u00E0 distance +lutinvcs.tabs.tooltip.local=voir tous les fichiers locaux +lutinvcs.tabs.tooltip.remote=voir tous les fichiers \u00E0 distance Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/AddRemove_C32.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/AddRemove_C32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/advanced.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/advanced.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/autoRefresh.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/autoRefresh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/autorefresh-icon.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/autorefresh-icon.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/clearFilter.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/clearFilter.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/commit.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/commit.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/compileSingle.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/compileSingle.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/conflicts-badge.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/conflicts-badge.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/cut.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/cut.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/diff-next.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/diff-next.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/diff-prev.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/diff-prev.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/diff.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/diff.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/diff_file_16.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/diff_file_16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/envelope_small.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/envelope_small.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/export.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/export.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/filter.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/filter.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/find_next.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/find_next.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/find_previous.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/find_previous.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/find_selection.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/find_selection.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/generalOptions.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/generalOptions.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/import-elements.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/import-elements.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/local_vs_local.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/local_vs_local.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/locally_mod.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/locally_mod.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/loop.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/loop.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/modified-badge.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/modified-badge.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/newFile24.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/newFile24.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/password_field_32.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/password_field_32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/paste.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/paste.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/recent_messages.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/recent_messages.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/recent_msgs.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/recent_msgs.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/refresh.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/refresh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remote_vs_local.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remote_vs_local.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remote_vs_remote.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remote_vs_remote.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/rollback.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/rollback.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/save.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/save.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/save24.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/save24.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/search_types.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/search_types.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/search_types_disabled.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/search_types_disabled.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/server.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/server.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/update.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/update.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/versioning-view.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/versioning-view.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx (rev 0) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx 2008-04-01 02:24:14 UTC (rev 271) @@ -0,0 +1,128 @@ +<JDialog title='lutinvcs.synch.title' id='ui' + defaultCloseOperation='DISPOSE_ON_CLOSE'> + <style source="common.css"/> + <script> + + import org.codelutin.vcs.VCSAction; + + protected void selectTab(String tabname) { + model.setTabModel(model.getModel(tabname)); + } + + protected void doAllAction(VCSAction action) { + model.doAllAction(action); + } + Action quitAction; + + JRootPane rootPane = ui.getRootPane(); + rootPane.setDefaultButton(quit); + quitAction = new AbstractAction(quit.getText()) { + 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); + allTable.setModel(model.getModel("model.synch.all")); + localTable.setModel(model.getModel("model.synch.local")); + remoteTable.setModel(model.getModel("model.synch.remote")); + refresh.setText(""); + diffAll.setText(""); + updateAll.setText(""); + commitAll.setText(""); + revertAll.setText(""); + + </script> + +  + + <org.codelutin.vcs.ui.model.SynchUIModel id="model"/> + + <DefaultListModel id='listModel'/> +  +  + <java.awt.CardLayout id='cardLayout'/> + + <JPopupMenu id="tablePopupMenu" invoker='{allTable}' enabled='false'> + <JMenuItem id='diff' text="lutinvcs.action.diff" toolTipText="lutinvcs.action.tooltip.diff"/> + <JMenuItem id='update' text="lutinvcs.action.update" toolTipText="lutinvcs.action.tooltip.update"/> + <JMenuItem id='commit' text="lutinvcs.action.commit" toolTipText="lutinvcs.action.tooltip.commit"/> + <JMenuItem id='revert' text="lutinvcs.action.revert" toolTipText="lutinvcs.action.tooltip.revert"/> + </JPopupMenu> + <Table> + <row fill='both'> + <cell fill='both' weightx='1'> + <JToolBar> + <JToggleButton id='allTab' selected='true' buttonGroup='tabs' text='lutinvcs.tabs.all' mnemonic="A" + toolTipText="lutinvcs.tabs.tooltip.all" + onActionPerformed='selectTab("model.synch.all")'/> + <JToggleButton id='localTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.local' + mnemonic="L" + toolTipText="lutinvcs.tabs.tooltip.local" + onActionPerformed='selectTab("model.synch.local")'/> + <JToggleButton id='remoteTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.remote' + mnemonic="R" + toolTipText="lutinvcs.tabs.tooltip.remote" + onActionPerformed='selectTab("model.synch.remote")'/> + + <JButton id='refresh' text="lutinvcs.action.refresh" toolTipText="lutinvcs.action.tooltip.refresh" + icon='{createImageIcon("autoRefresh.png")}'/> + + <JButton id='diffAll' text="lutinvcs.action.diffAll" toolTipText="lutinvcs.action.tooltip.diffAll" + icon='{createImageIcon("diff.png")}' onActionPerformed='doAllAction(VCSAction.DIFF)'/> + + <JButton id='updateAll' text="lutinvcs.action.updateAll" + onActionPerformed='doAllAction(VCSAction.UPDATE)' + toolTipText="lutinvcs.action.tooltip.updateAll" icon='{createImageIcon("update.png")}'/> + + <JButton id='commitAll' text="lutinvcs.action.commitAll" + onActionPerformed='doAllAction(VCSAction.COMMIT)' + toolTipText="lutinvcs.action.tooltip.commitAll" icon='{createImageIcon("commit.png")}'/> + + <JButton id='revertAll' text="lutinvcs.action.revertAll" + onActionPerformed='doAllAction(VCSAction.REVERT)' + toolTipText="lutinvcs.action.tooltip.revertAll" icon='{createImageIcon("rollback.png")}'/> + </JToolBar> + </cell> + </row> + <row fill='both'> + <cell fill='both' weighty='1' weightx='2'> + <JPanel id='preview' layout='{cardLayout}'> + <JScrollPane id='allContent' styleClass='updateScroll' constraints='"model.synch.all"'> + <JTable id="allTable" styleClass='updateTable'/> + </JScrollPane> + <JScrollPane id='localContent' styleClass='updateScroll' constraints='"model.synch.local"'> + <JTable id="localTable" styleClass='updateTable'/> + </JScrollPane> + <JScrollPane id='remoteContent' styleClass='updateScroll' constraints='"model.synch.remote"'> + <JTable id="remoteTable" styleClass='updateTable'/> + </JScrollPane> + </JPanel> + </cell> + </row> + <row> + <cell fill='both'> + <JButton id='quit' text='lutinvcs.quit' action='{quitAction}'/> + </cell> + </row> +  + </Table> +</JDialog> Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/SynchUIHandlerImpl.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/SynchUIHandlerImpl.java (rev 0) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/SynchUIHandlerImpl.java 2008-04-01 02:24:14 UTC (rev 271) @@ -0,0 +1,50 @@ +package org.codelutin.vcs.ui; + +import org.codelutin.vcs.VCSAction; +import org.codelutin.vcs.ui.model.SynchUIHandler; +import org.codelutin.vcs.ui.model.SynchUIModel; +import org.codelutin.vcs.ui.model.SynchVCSFileStatesModel; + +import java.beans.PropertyChangeEvent; +import java.util.ArrayList; +import java.util.List; + +/** @author chemit */ +public class SynchUIHandlerImpl extends SynchUIHandler { + + final SynchUI ui; + + public SynchUIHandlerImpl(SynchUI ui) { + this.ui = ui; + } + + public void init() { + super.init(); + this.ui.selectTab(VCSUIConstants.ALL_MODEL_PROPERTY); + } + + + @Override + public void propertyChange(PropertyChangeEvent evt) { + super.propertyChange(evt); + SynchVCSFileStatesModel model = (SynchVCSFileStatesModel) evt.getNewValue(); + + String tabModelName = ui.getModel().getTabModelName(model); + ui.cardLayout.show(ui.preview, tabModelName); + VCSAction[] actions = model.getActions(); + List<String> acts = new ArrayList<String>(); + for (VCSAction action : actions) { + acts.add(action.name().toLowerCase()); + } + boolean hasActions = actions.length > 0; + ui.getDiffAll().setEnabled(hasActions && acts.contains("diff")); + ui.getUpdateAll().setEnabled(hasActions && acts.contains("update")); + ui.getCommitAll().setEnabled(hasActions && acts.contains("commit")); + ui.getRevertAll().setEnabled(hasActions && acts.contains("revert")); + ui.getRefresh().setEnabled(hasActions); + } + + public SynchUIModel getModel() { + return ui.getModel(); + } +} Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/common.css =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/common.css (rev 0) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/common.css 2008-04-01 02:24:14 UTC (rev 271) @@ -0,0 +1,52 @@ +JToolBar { + floatable: false; + focusable: false; + opaque: false; + margin: 0; + borderPainted: false; +} + +JButton { + opaque: false; + borderPainted: false; + enabled: false; + margin: 0; +} + +JToggleButton { + opaque: false; + borderPainted: false; + margin: 0; +} + +JMenuItem { + enabled: true; +} + +JMenu { + enabled: true; +} + +.smallSize { + font-size: 9; +} + +.updateTable { + rowSelectionAllowed: true; + /*autoResizeMode: auto_resize_all_columns; + autoResizeMode: auto_resize_last_column;*/ + showVerticalLines: false; + cellSelectionEnabled: false; + rowMargin: 0; + selectionMode: { ListSelectionModel . MULTIPLE_INTERVAL_SELECTION +} + +; + +} + +.updateScroll { + verticalScrollBarPolicy: 20; + horizontalScrollBarPolicy: 31; + visible: false; +} \ No newline at end of file Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/fr/rst/devel/index.rst =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/fr/rst/devel/index.rst (rev 0) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/fr/rst/devel/index.rst 2008-04-01 02:24:14 UTC (rev 271) @@ -0,0 +1,5 @@ +================ +Lutin vcs ui dev +================ + +TODO Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/fr/rst/index.rst =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/fr/rst/index.rst (rev 0) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/fr/rst/index.rst 2008-04-01 02:24:14 UTC (rev 271) @@ -0,0 +1,5 @@ +============ +Lutin vcs ui +============ + +TODO \ No newline at end of file Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/fr/rst/todo.rst =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/fr/rst/todo.rst (rev 0) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/fr/rst/todo.rst 2008-04-01 02:24:14 UTC (rev 271) @@ -0,0 +1,4 @@ +==================== +Lutinvcs - ui - TODO +==================== + Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/site_fr.xml =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/site_fr.xml (rev 0) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/site/site_fr.xml 2008-04-01 02:24:14 UTC (rev 271) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<project name="simexplorer-si"> + + <skin> + <groupId>lutinlib</groupId> + <artifactId>lutin-site-skin</artifactId> + <version>0.1</version> + </skin> + + <bannerLeft> + <name>Système d'information - SimExplorer</name> + </bannerLeft> + + <bannerRight> + <src> + http://www.codelutin.com/images/lutinorange-codelutin.png + </src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <poweredBy> + <logo href="http://docutils.sourceforge.net/rst.html" + img="/images/restructuredtext-logo.png" name="reStructuredText"/> + </poweredBy> + + <body> + <menu name="Common Links" inherit="top"/> + <menu ref="parent"/> + <menu ref="reports"/> + + <menu name="Liens"> + <item href="http://java.sun.com/j2se" + name="Le site Java de Sun"> + </item> + </menu> + </body> +</project> Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/test/resources/log4j.properties =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/test/resources/log4j.properties (rev 0) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/test/resources/log4j.properties 2008-04-01 02:24:14 UTC (rev 271) @@ -0,0 +1,9 @@ +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +#log4j.appender.stdout.layout.ConversionPattern=%%c=%c %%C=%C %%d=%d %%F=%F %%l=%l %%L=%L %%m=%m %%M=%M %%p=%p %%r=%r %%t=%t %%x=%x %%X=%X +# package level +log4j.logger.org.codelutin=INFO

1 0

[Buix-commits] r270 - in trunk/lutinvcs: . lutinvcs-api lutinvcs-core lutinvcs-provider-cvs lutinvcs-ui
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 23:25:46 +0000 (Mon, 31 Mar 2008) New Revision: 270 Removed: trunk/lutinvcs/.cvsignore trunk/lutinvcs/lutinvcs-api/.cvsignore trunk/lutinvcs/lutinvcs-core/.cvsignore trunk/lutinvcs/lutinvcs-provider-cvs/.cvsignore trunk/lutinvcs/lutinvcs-ui/.cvsignore Log: bye-bye! Deleted: trunk/lutinvcs/.cvsignore =================================================================== --- trunk/lutinvcs/.cvsignore 2008-03-31 23:24:36 UTC (rev 269) +++ trunk/lutinvcs/.cvsignore 2008-03-31 23:25:46 UTC (rev 270) @@ -1,7 +0,0 @@ -target -velocity.log -maven.log -.eclipse -.classpath -lutinutil.iml -lutinutil.ipr Deleted: trunk/lutinvcs/lutinvcs-api/.cvsignore =================================================================== --- trunk/lutinvcs/lutinvcs-api/.cvsignore 2008-03-31 23:24:36 UTC (rev 269) +++ trunk/lutinvcs/lutinvcs-api/.cvsignore 2008-03-31 23:25:46 UTC (rev 270) @@ -1,6 +0,0 @@ -target -target/* -velocity.log -maven.log -.eclipse -.classpath Deleted: trunk/lutinvcs/lutinvcs-core/.cvsignore =================================================================== --- trunk/lutinvcs/lutinvcs-core/.cvsignore 2008-03-31 23:24:36 UTC (rev 269) +++ trunk/lutinvcs/lutinvcs-core/.cvsignore 2008-03-31 23:25:46 UTC (rev 270) @@ -1,7 +0,0 @@ -target -velocity.log -maven.log -.eclipse -.classpath -lutinutil.iml -lutinutil.ipr Deleted: trunk/lutinvcs/lutinvcs-provider-cvs/.cvsignore =================================================================== --- trunk/lutinvcs/lutinvcs-provider-cvs/.cvsignore 2008-03-31 23:24:36 UTC (rev 269) +++ trunk/lutinvcs/lutinvcs-provider-cvs/.cvsignore 2008-03-31 23:25:46 UTC (rev 270) @@ -1,7 +0,0 @@ -target -velocity.log -maven.log -.eclipse -.classpath -lutinutil.iml -lutinutil.ipr Deleted: trunk/lutinvcs/lutinvcs-ui/.cvsignore =================================================================== --- trunk/lutinvcs/lutinvcs-ui/.cvsignore 2008-03-31 23:24:36 UTC (rev 269) +++ trunk/lutinvcs/lutinvcs-ui/.cvsignore 2008-03-31 23:25:46 UTC (rev 270) @@ -1,7 +0,0 @@ -target -velocity.log -maven.log -.eclipse -.classpath -lutinutil.iml -lutinutil.ipr

1 0

[Buix-commits] r269 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 23:24:36 +0000 (Mon, 31 Mar 2008) New Revision: 269 Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java Log: improve display Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java 2008-03-31 23:24:26 UTC (rev 268) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java 2008-03-31 23:24:36 UTC (rev 269) @@ -78,7 +78,7 @@ public void setData(List<VCSFileState> states) { getModel(ALL_MODEL_PROPERTY).setData(states); - List<VCSFileState> local = new ArrayList<VCSFileState>(states); + List<VCSFileState> local = new ArrayList<VCSFileState>(); List<VCSFileState> remote = new ArrayList<VCSFileState>(); splitStates(states, local, remote); getModel(LOCAL_MODEL_PROPERTY).setData(local); @@ -112,10 +112,10 @@ protected void splitStates(List<VCSFileState> states, List<VCSFileState> local, List<VCSFileState> remote) { for (VCSFileState state : states) { - if (state.getState()!=null && state.getState().isLocal()) { + if (state.getState() != null && state.getState().isLocal()) { local.add(state); } - if (state.getState()!=null && state.getState().isRemote()) { + if (state.getState() != null && state.getState().isRemote()) { remote.add(state); } }

1 0

[Buix-commits] r268 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 23:24:26 +0000 (Mon, 31 Mar 2008) New Revision: 268 Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchVCSFileStatesModel.java Log: improve display Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchVCSFileStatesModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchVCSFileStatesModel.java 2008-03-31 23:24:12 UTC (rev 267) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchVCSFileStatesModel.java 2008-03-31 23:24:26 UTC (rev 268) @@ -32,14 +32,14 @@ Object result = null; if (columnIndex == 0) { // get module - result = item.getLocalPath(); + result = item.getModuleName(); } else if (columnIndex == 1) { // get file - result = item.getFile().getName(); + result = item.getModuleRelativeFileName(); } else if (columnIndex == 2) { // get status VCSState state = item.getState(); - result = state==null?null:state.libelle(); + result = state == null ? null : state.libelle(); } return result; }

1 0