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

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

April 2, 2008

Author: tchemit Date: 2008-04-02 09:04:33 +0000 (Wed, 02 Apr 2008) New Revision: 283 Removed: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSSynchAction.java Log: no way ! Deleted: 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 2008-04-02 08:55:49 UTC (rev 282) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSSynchAction.java 2008-04-02 09:04:33 UTC (rev 283) @@ -1,37 +0,0 @@ -/** - * # #% 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) { - - } -}

1 0

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

April 2, 2008

Author: tchemit Date: 2008-04-02 08:55:49 +0000 (Wed, 02 Apr 2008) New Revision: 282 Modified: 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 Log: popup pour les actions sur la selection des lignes l'ui de synch avance bien Modified: 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 2008-04-02 08:55:11 UTC (rev 281) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-en_GB.properties 2008-04-02 08:55:49 UTC (rev 282) @@ -1,21 +1,21 @@ lutinvcs.action.commit=commit -lutinvcs.action.commitAll=commit all -lutinvcs.action.diff=diff -lutinvcs.action.diffAll=diff all -lutinvcs.action.refresh= +lutinvcs.action.delete=delete +lutinvcs.action.diff=show diff +lutinvcs.action.refresh=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.delete=delete +lutinvcs.action.tooltip.deleteAll=delete 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.refreshAll=refrsh all 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 Modified: 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 2008-04-02 08:55:11 UTC (rev 281) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-fr_FR.properties 2008-04-02 08:55:49 UTC (rev 282) @@ -1,21 +1,21 @@ -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.commit=committer +lutinvcs.action.delete=supprimer +lutinvcs.action.diff=voir les diff +lutinvcs.action.refresh=rafra\u00EEchir +lutinvcs.action.revert=annuler les modifications lutinvcs.action.tooltip.commit=commiter les fichiers s\u00E9lectionn\u00E9s lutinvcs.action.tooltip.commitAll=commiter tous les fichiers +lutinvcs.action.tooltip.delete=supprimer les fichiers s\u00E9lectionn\u00E9s +lutinvcs.action.tooltip.deleteAll=supprimer 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.refreshAll=rafra\u00EEchir tous les fichiers 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.revertAll=annuler 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.action.update=mettre \u00E0 jour lutinvcs.quit=Quitter lutinvcs.synch.title=Synchronisation lutinvcs.tabs.all=all

1 0

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

April 2, 2008

Author: tchemit Date: 2008-04-02 08:55:11 +0000 (Wed, 02 Apr 2008) New Revision: 281 Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx Log: popup pour les actions sur la selection des lignes l'ui de synch avance bien Modified: 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 2008-04-02 08:53:39 UTC (rev 280) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx 2008-04-02 08:55:11 UTC (rev 281) @@ -1,10 +1,42 @@ -<JDialog title='lutinvcs.synch.title' id='ui' - defaultCloseOperation='DISPOSE_ON_CLOSE'> +<JDialog title='lutinvcs.synch.title' id='ui' defaultCloseOperation='DISPOSE_ON_CLOSE'> <style source="common.css"/> <script> import org.codelutin.vcs.VCSAction; + import org.codelutin.vcs.ui.action.AbstractSynchUIHandler; + protected AbstractSynchUIHandler handler; + + public JTable getTable(String modelName) { + return (JTable) get$objectMap().get(modelName+"Table"); + } + + public JVCSPopup getPopup(String modelName) { + return (JVCSPopup) get$objectMap().get(modelName+"Popup"); + } + + @Override + public void setVisible(boolean b) { + if (getHandler().getModel().getTabModel() == null) { + getHandler().init(); + // first launch, no tab model selected,choose one + selectTab(VCSUIConstants.ALL_MODEL_PROPERTY); + } + super.setVisible(b); + } + + public JSynchUI(AbstractSynchUIHandler handler) { + this.handler =handler; + } + + protected AbstractSynchUIHandler getHandler() { + return handler; + } + + protected void setHandler(AbstractSynchUIHandler handler) { + this.handler = handler; + } + protected void selectTab(String tabname) { model.setTabModel(model.getModel(tabname)); } @@ -12,8 +44,8 @@ protected void doAllAction(VCSAction action) { model.doAllAction(action); } + Action quitAction; - JRootPane rootPane = ui.getRootPane(); rootPane.setDefaultButton(quit); quitAction = new AbstractAction(quit.getText()) { @@ -24,79 +56,67 @@ }; 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 enabled='false'> </JPopupMenu> + <org.codelutin.vcs.ui.JVCSPopup id="modelSynchAllPopup"/> + <org.codelutin.vcs.ui.JVCSPopup id="modelSynchLocalPopup"/> + <org.codelutin.vcs.ui.JVCSPopup id="modelSynchRemotePopup"/> <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")'/> + onActionPerformed='selectTab("modelSynchAll")'/> <JToggleButton id='localTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.local' - mnemonic="L" - toolTipText="lutinvcs.tabs.tooltip.local" - onActionPerformed='selectTab("model.synch.local")'/> + mnemonic="L" toolTipText="lutinvcs.tabs.tooltip.local" + onActionPerformed='selectTab("modelSynchLocal")'/> <JToggleButton id='remoteTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.remote' - mnemonic="R" - toolTipText="lutinvcs.tabs.tooltip.remote" - onActionPerformed='selectTab("model.synch.remote")'/> + mnemonic="R" toolTipText="lutinvcs.tabs.tooltip.remote" + onActionPerformed='selectTab("modelSynchRemote")'/> - <JButton id='refresh' text="lutinvcs.action.refresh" toolTipText="lutinvcs.action.tooltip.refresh" - icon='{createImageIcon("autoRefresh.png")}'/> + <JButton id='refreshAll' toolTipText="lutinvcs.action.tooltip.refreshAll" + icon='{createImageIcon("autoRefresh.png")}' + onActionPerformed='doAllAction(VCSAction.REFRESH)'/> - <JButton id='diffAll' text="lutinvcs.action.diffAll" toolTipText="lutinvcs.action.tooltip.diffAll" + <JButton id='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='updateAll' toolTipText="lutinvcs.action.tooltip.updateAll" + icon='{createImageIcon("update.png")}' + onActionPerformed='doAllAction(VCSAction.UPDATE)'/> - <JButton id='commitAll' text="lutinvcs.action.commitAll" - onActionPerformed='doAllAction(VCSAction.COMMIT)' - toolTipText="lutinvcs.action.tooltip.commitAll" icon='{createImageIcon("commit.png")}'/> + <JButton id='commitAll' toolTipText="lutinvcs.action.tooltip.commitAll" + icon='{createImageIcon("commit.png")}' + onActionPerformed='doAllAction(VCSAction.COMMIT)'/> - <JButton id='revertAll' text="lutinvcs.action.revertAll" - onActionPerformed='doAllAction(VCSAction.REVERT)' - toolTipText="lutinvcs.action.tooltip.revertAll" icon='{createImageIcon("rollback.png")}'/> + <JButton id='revertAll' toolTipText="lutinvcs.action.tooltip.revertAll" + icon='{createImageIcon("rollback.png")}' + onActionPerformed='doAllAction(VCSAction.REVERT)'/> + + <JButton id='deleteAll' toolTipText="lutinvcs.action.tooltip.deleteAll" + icon='{createImageIcon("remove.png")}' + onActionPerformed='doAllAction(VCSAction.DELETE)'/> </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 id='allContent' styleClass='updateScroll' constraints='"modelSynchAll"'> + <JTable id="modelSynchAllTable" styleClass='updateTable'/> </JScrollPane> - <JScrollPane id='localContent' styleClass='updateScroll' constraints='"model.synch.local"'> - <JTable id="localTable" styleClass='updateTable'/> + <JScrollPane id='localContent' styleClass='updateScroll' constraints='"modelSynchLocal"'> + <JTable id="modelSynchLocalTable" styleClass='updateTable'/> </JScrollPane> - <JScrollPane id='remoteContent' styleClass='updateScroll' constraints='"model.synch.remote"'> - <JTable id="remoteTable" styleClass='updateTable'/> + <JScrollPane id='remoteContent' styleClass='updateScroll' constraints='"modelSynchRemote"'> + <JTable id="modelSynchRemoteTable" styleClass='updateTable'/> </JScrollPane> </JPanel> </cell> Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx (rev 0) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx 2008-04-02 08:55:11 UTC (rev 281) @@ -0,0 +1,30 @@ +<JPopupMenu enabled='false'> + <script> + import org.codelutin.vcs.VCSAction; + import org.codelutin.vcs.ui.action.VCSAbsractAction; + + protected VCSAbsractAction dispatchAction; + + protected void setDispatchAction(VCSAbsractAction action) { + this.dispatchAction=action; + } + + protected void doAction(VCSAction action,JMenuItem item) { + dispatchAction.setAction(action); + ActionEvent e = new ActionEvent( item,1,action.name()); + dispatchAction.actionPerformed(e); + } + </script> + <JMenuItem id='refresh' text="lutinvcs.action.refresh" toolTipText="lutinvcs.action.tooltip.refresh" + icon='{createImageIcon("autoRefresh.png")}' onActionPerformed='doAction(VCSAction.REFRESH,refresh)'/> + <JMenuItem id='diff' text="lutinvcs.action.diff" toolTipText="lutinvcs.action.tooltip.diff" + icon='{createImageIcon("diff.png")}' onActionPerformed='doAction(VCSAction.DIFF,diff)'/> + <JMenuItem id='update' text="lutinvcs.action.update" toolTipText="lutinvcs.action.tooltip.update" + icon='{createImageIcon("update.png")}' onActionPerformed='doAction(VCSAction.UPDATE,update)'/> + <JMenuItem id='commit' text="lutinvcs.action.commit" toolTipText="lutinvcs.action.tooltip.commit" + icon='{createImageIcon("commit.png")}' onActionPerformed='doAction(VCSAction.COMMIT,commit)'/> + <JMenuItem id='revert' text="lutinvcs.action.revert" toolTipText="lutinvcs.action.tooltip.revert" + icon='{createImageIcon("rollback.png")}' onActionPerformed='doAction(VCSAction.REVERT,revert)'/> + <JMenuItem id='delete' text="lutinvcs.action.delete" toolTipText="lutinvcs.action.tooltip.delete" + icon='{createImageIcon("remove.png")}' onActionPerformed='doAction(VCSAction.DELETE,delete)'/> +</JPopupMenu>

1 0

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

April 2, 2008

Author: tchemit Date: 2008-04-02 08:53:39 +0000 (Wed, 02 Apr 2008) New Revision: 280 Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/BUTTON32.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/Button_C32.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/actionSelect.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/both_mod.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/delete.gif trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remove.png Log: new icons Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/BUTTON32.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/BUTTON32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/Button_C32.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/Button_C32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/actionSelect.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/actionSelect.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/both_mod.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/both_mod.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/delete.gif =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/delete.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remove.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remove.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

[Buix-commits] r279 - trunk/lutinvcs/lutinvcs-ui-jaxx
by tchemit＠users.labs.libre-entreprise.org April 2, 2008

April 2, 2008

Author: tchemit Date: 2008-04-02 08:51:22 +0000 (Wed, 02 Apr 2008) New Revision: 279 Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/ Log: svn ignore Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx ___________________________________________________________________ Name: svn:ignore + target

1 0

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

April 1, 2008

Author: tchemit Date: 2008-04-01 02:28:32 +0000 (Tue, 01 Apr 2008) New Revision: 278 Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/java/ Log: svn ignore Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/java ___________________________________________________________________ Name: svn:ignore + org org/*

1 0

[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