[Buix-commits] r407 - in trunk/lutinvcs: lutinvcs-ui/src/main/java/org/codelutin/vcs/ui lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model

Author: tchemit Date: 2008-04-06 15:16:51 +0000 (Sun, 06 Apr 2008) New Revision: 407 Removed: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSPopupAction.java Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractConfirmUI.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractDiffUI.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractSynchUI.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractTabUI.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/UIHelper.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractConfirmUIHandler.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractDiffUIHandler.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractSynchUIHandler.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractTabUIHandler.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractUIHandler.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/AbstractTabUIModel.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/AbstractUIModel.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/AbstractVCSEntriesTableModel.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/ConfirmUIModel.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/DiffPanelUIModel.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/SimpleVCSEntriesTableModelImpl.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/ConfirmUIHandler.java trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java Log: improve ui design Modified: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/ConfirmUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/ConfirmUIHandler.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/ConfirmUIHandler.java 2008-04-06 15:16:51 UTC (rev 407) @@ -45,7 +45,7 @@ VCSAction action = ui.getModel().getAction(); ui.getAccept().setText(action.getLibelle()); ui.getToolbar().setVisible(action.isCommit()); - ui.getHandler().getSelectionModel().setSelectionInterval(0, getModel().getModel().getRowCount() - 1); + ui.getHandler().getSelectionModel().setSelectionInterval(0, getModel().getEntriesModel().getRowCount() - 1); } protected void updateMessageUI() { Modified: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java 2008-04-06 15:16:51 UTC (rev 407) @@ -4,11 +4,13 @@ import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.type.VCSEntryLocation; import org.codelutin.vcs.ui.handler.AbstractSynchUIHandler; +import org.codelutin.vcs.ui.handler.VCSAbsractAction; import org.codelutin.vcs.ui.model.AbstractVCSEntriesTableModel; import org.codelutin.vcs.ui.model.SynchUIModel; import javax.swing.JTable; import javax.swing.ListSelectionModel; +import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; @@ -32,7 +34,15 @@ } public void doAllAction(VCSAction action) { - AbstractVCSEntriesTableModel model = getModel().getModel(); + doAction(action, false); + } + + public void doSelectAction(VCSAction action) { + doAction(action, true); + } + + public void doAction(VCSAction action, boolean useSelection) { + AbstractVCSEntriesTableModel model = getModel().getEntriesModel(); log.info(action + " : " + model); ListSelectionModel selectionModel = getSelectionModel(); if (action == VCSAction.REFRESH) { @@ -41,7 +51,7 @@ log.info("refresh :" + model.getRowCount()); model.refresh(model.getEntries(), System.nanoTime()); } else { - List<VCSEntry> entries = model.filter(action, model.getDisplayedEntries(null)); + List<VCSEntry> entries = model.filter(action, model.getDisplayedEntries(useSelection ? selectionModel : null)); if (entries.isEmpty()) { // nothing to do return; @@ -63,11 +73,18 @@ protected void initTab(VCSEntryLocation location) { JTable table = getUi().getTable(location); - AbstractVCSEntriesTableModel fileStatesModel = getModel().getModel(); + AbstractVCSEntriesTableModel fileStatesModel = getModel().getEntriesModel(); table.setModel(fileStatesModel); table.addMouseListener(new ListMouseListener(ui, fileStatesModel, location)); AbstractVCSPopup jvcsPopup = getUi().getPopup(location); - jvcsPopup.setDispatchAction(new VCSPopupAction(ui, location)); + //jvcsPopup.setDispatchAction(new VCSPopupAction(this, location)); + jvcsPopup.setDispatchAction(new VCSAbsractAction() { + private static final long serialVersionUID = 8622118724992019898L; + + public void actionPerformed(ActionEvent e) { + doSelectAction(action); + } + }); } protected static class ListMouseListener extends MouseAdapter { Deleted: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSPopupAction.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSPopupAction.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSPopupAction.java 2008-04-06 15:16:51 UTC (rev 407) @@ -1,70 +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; - -import org.codelutin.vcs.type.VCSAction; -import org.codelutin.vcs.VCSEntry; -import org.codelutin.vcs.type.VCSEntryLocation; -import org.codelutin.vcs.ui.handler.VCSAbsractAction; -import org.codelutin.vcs.ui.model.AbstractVCSEntriesTableModel; - -import javax.swing.ListSelectionModel; -import java.awt.event.ActionEvent; -import java.util.List; - -/** - * Action of a clik inside the popup menu - * - * @author chemit - */ -public class VCSPopupAction extends VCSAbsractAction { - private static final long serialVersionUID = -1983061535956510913L; - - protected VCSEntryLocation location; - protected transient ListSelectionModel selectionModel; - - protected transient AbstractTabUI ui; - - protected AbstractVCSEntriesTableModel tableModel; - - public VCSPopupAction(AbstractTabUI ui, VCSEntryLocation location) { - super(); - this.ui = ui; - this.location = location; - //this.selectionModel = ui.getHandler().getSelectionModel(); - this.selectionModel = ui.getTable(location).getSelectionModel(); - tableModel = ui.getModel().getModel(); - } - - public void actionPerformed(ActionEvent e) { - // select only lines for this action inside already selected lines - List<VCSEntry> entries = tableModel.filter(action, tableModel.getDisplayedEntries(selectionModel)); - log.info("action: " + action + ", files to treate :" + entries.size() + " " + selectionModel); - if (action == VCSAction.DIFF) { - // show diff ui - ui.getModel().refresh(entries); - - } else if (action == VCSAction.REFRESH) { - // refresh ui, and update list if needed - - } else { - // show confirm action ui - AbstractConfirmUI confirmUI = VCSUIFactory.newConfirmUI(); - confirmUI.getModel().init(action, tableModel.getLocation(), entries.toArray(new VCSEntry[entries.size()])); - confirmUI.getHandler().getSelectionModel().setSelectionInterval(0, entries.size() - 1); - confirmUI.setVisible(true); - } - } -} Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx 2008-04-06 15:16:51 UTC (rev 407) @@ -2,12 +2,9 @@ resizable='false' height='300' width='400'> <style source="common.css"/> <script> - import org.codelutin.vcs.type.VCSAction; - public JConfirmUI(org.codelutin.vcs.ui.handler.AbstractConfirmUIHandler handler) { super(handler); } - </script> <Table> <row fill='both'> @@ -27,8 +24,7 @@ <cell fill='both'/> </row> </Table> - <JButton id='lastMessages' - toolTipText="lutinvcs.action.tooltip.lastMessages" + <JButton id='lastMessages' toolTipText="lutinvcs.action.tooltip.lastMessages" icon='{createImageIcon("recent_msgs.png")}' onActionPerformed='showLastMessages()'/> </JToolBar> @@ -48,7 +44,7 @@ <row> <cell fill='both' weightx='1' weighty='1'> <JScrollPane id='content' styleClass='confirmScroll'> - <JTable id="contentTable" styleClass='confirmTable' model="{getModel().getModel()}"/> + <JTable id="contentTable" styleClass='confirmTable' model="{getModel().getEntriesModel()}"/> </JScrollPane> </cell> </row> Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx 2008-04-06 15:16:51 UTC (rev 407) @@ -60,17 +60,14 @@ <row fill='both'> <cell fill='both' weighty='1' weightx='2'> <JPanel id='preview' layout='{cardLayout}'> - <JScrollPane id='allContent' styleClass='diffScroll' constraints='"modelSynchAll"'> - <JTable id="allTable" styleClass='diffTable' - onMouseClicked="selectFile(allTable)"/> + <JScrollPane id='allContent' styleClass='diffScroll' constraints='"taball"'> + <JTable id="allTable" styleClass='diffTable' onMouseClicked="selectFile()"/> </JScrollPane> - <JScrollPane id='localContent' styleClass='diffScroll' constraints='"modelSynchLocal"'> - <JTable id="localTable" styleClass='diffTable' - onMouseClicked="selectFile(localTable)"/> + <JScrollPane id='localContent' styleClass='diffScroll' constraints='"tablocal"'> + <JTable id="localTable" styleClass='diffTable' onMouseClicked="selectFile()"/> </JScrollPane> - <JScrollPane id='remoteContent' styleClass='diffScroll' constraints='"modelSynchRemote"' - onMouseClicked="selectFile(remoteTable)"> - <JTable id="remoteTable" styleClass='diffTable'/> + <JScrollPane id='remoteContent' styleClass='diffScroll' constraints='"tabremote"'> + <JTable id="remoteTable" styleClass='diffTable' onMouseClicked="selectFile()"/> </JScrollPane> </JPanel> </cell> 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-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx 2008-04-06 15:16:51 UTC (rev 407) @@ -1,5 +1,4 @@ -<AbstractSynchUI title='lutinvcs.synch.title' modal="true" id='synchui' - defaultCloseOperation='DISPOSE_ON_CLOSE'> +<AbstractSynchUI title='lutinvcs.synch.title' modal="true" defaultCloseOperation='DISPOSE_ON_CLOSE'> <style source="common.css"/> <script> import org.codelutin.vcs.type.VCSAction; @@ -8,65 +7,66 @@ public JSynchUI(org.codelutin.vcs.ui.handler.AbstractSynchUIHandler handler) { super(handler); } - //add(table); </script> <java.awt.CardLayout id='cardLayout'/> + <JVCSPopup id="allPopup"/> + <JVCSPopup id="localPopup"/> + <JVCSPopup id="remotePopup"/> <Table id='table'> <row fill='both'> <cell fill='both' weightx='1'> <JToolBar> - <!--JPopupMenu enabled='false'/--> - <org.codelutin.vcs.ui.JVCSPopup id="allPopup"/> - <org.codelutin.vcs.ui.JVCSPopup id="localPopup"/> - <org.codelutin.vcs.ui.JVCSPopup id="remotePopup"/> + <JToggleButton id='allTab' buttonGroup='tabs' text='lutinvcs.tabs.all' mnemonic="A" toolTipText="lutinvcs.tabs.tooltip.all" onActionPerformed='setLocation(VCSEntryLocation.ALL)'/> + <JToggleButton id='localTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.local' mnemonic="L" toolTipText="lutinvcs.tabs.tooltip.local" onActionPerformed='setLocation(VCSEntryLocation.LOCAL)'/> + <JToggleButton id='remoteTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.remote' mnemonic="R" toolTipText="lutinvcs.tabs.tooltip.remote" onActionPerformed='setLocation(VCSEntryLocation.REMOTE)'/> <JButton id='refreshAll' toolTipText="lutinvcs.action.tooltip.refreshAll" icon='{createImageIcon("autoRefresh.png")}' - onActionPerformed='doAllAction(VCSAction.REFRESH)'/> + onActionPerformed='doAction(VCSAction.REFRESH,false)'/> <JButton id='diffAll' toolTipText="lutinvcs.action.tooltip.diffAll" - icon='{createImageIcon("diff.png")}' onActionPerformed='doAllAction(VCSAction.DIFF)'/> + icon='{createImageIcon("diff.png")}' onActionPerformed='doAction(VCSAction.DIFF,false)'/> <JButton id='updateAll' toolTipText="lutinvcs.action.tooltip.updateAll" icon='{createImageIcon("update.png")}' - onActionPerformed='doAllAction(VCSAction.UPDATE)'/> + onActionPerformed='doAction(VCSAction.UPDATE,false)'/> <JButton id='commitAll' toolTipText="lutinvcs.action.tooltip.commitAll" icon='{createImageIcon("commit.png")}' - onActionPerformed='doAllAction(VCSAction.COMMIT)'/> + onActionPerformed='doAction(VCSAction.COMMIT,false)'/> <JButton id='revertAll' toolTipText="lutinvcs.action.tooltip.revertAll" icon='{createImageIcon("rollback.png")}' - onActionPerformed='doAllAction(VCSAction.REVERT)'/> + onActionPerformed='doAction(VCSAction.REVERT,false)'/> <JButton id='deleteAll' toolTipText="lutinvcs.action.tooltip.deleteAll" icon='{createImageIcon("remove.png")}' - onActionPerformed='doAllAction(VCSAction.DELETE)'/> + onActionPerformed='doAction(VCSAction.DELETE,false)'/> </JToolBar> </cell> </row> <row fill='both'> <cell fill='both' weighty='1' weightx='2'> <JPanel id='preview' layout='{cardLayout}'> - <JScrollPane id='allContent' styleClass='updateScroll' constraints='"modelSynchAll"'> + <JScrollPane id='allContent' styleClass='updateScroll' constraints='"taball"'> <JTable id="allTable" styleClass='updateTable'/> </JScrollPane> - <JScrollPane id='localContent' styleClass='updateScroll' constraints='"modelSynchLocal"'> + <JScrollPane id='localContent' styleClass='updateScroll' constraints='"tablocal"'> <JTable id="localTable" styleClass='updateTable'/> </JScrollPane> - <JScrollPane id='remoteContent' styleClass='updateScroll' constraints='"modelSynchRemote"'> + <JScrollPane id='remoteContent' styleClass='updateScroll' constraints='"tabremote"'> <JTable id="remoteTable" styleClass='updateTable'/> </JScrollPane> </JPanel> Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractConfirmUI.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractConfirmUI.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractConfirmUI.java 2008-04-06 15:16:51 UTC (rev 407) @@ -16,8 +16,6 @@ import jaxx.runtime.swing.Table; import org.codelutin.vcs.ui.handler.AbstractConfirmUIHandler; -import org.codelutin.vcs.ui.handler.AbstractUIHandler; -import org.codelutin.vcs.ui.model.AbstractUIModel; import org.codelutin.vcs.ui.model.ConfirmUIModel; import javax.swing.JButton; @@ -68,10 +66,18 @@ } public void doAccept() { - getHandler().doAction(getCommitMessage().getText(), getModel().getModel()); + getHandler().doAction(getCommitMessage().getText(), getModel().getEntriesModel()); } protected void showLastMessages() { } + + @Override + public void setVisible(boolean b) { + if (b) { + getAccept().setEnabled(getModel().getEntriesModel().getRowCount() > 0); + } + super.setVisible(b); + } } Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractDiffUI.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractDiffUI.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractDiffUI.java 2008-04-06 15:16:51 UTC (rev 407) @@ -20,7 +20,6 @@ import org.codelutin.vcs.ui.model.DiffUIModel; import javax.swing.JButton; -import javax.swing.JTable; /** @author chemit */ public abstract class AbstractDiffUI extends AbstractTabUI { @@ -37,16 +36,18 @@ super(handler, new DiffUIModel()); } + @Override public DiffUIModel getModel() { return (DiffUIModel) model; } + @Override protected AbstractDiffUIHandler getHandler() { return (AbstractDiffUIHandler) handler; } - protected void selectFile(JTable table) { - getModel().setFileModel(model.getModel().getDisplayedEntries(table.getSelectionModel()).get(0)); + protected void selectFile() { + getModel().setFileModel(model.getEntriesModel().getDisplayedEntries(getHandler().getSelectionModel()).get(0)); } protected void doAction(VCSAction action) { Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractSynchUI.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractSynchUI.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractSynchUI.java 2008-04-06 15:16:51 UTC (rev 407) @@ -20,7 +20,6 @@ import org.codelutin.vcs.ui.model.SynchUIModel; import javax.swing.JButton; -import java.awt.CardLayout; /** @author chemit */ public abstract class AbstractSynchUI extends AbstractTabUI { @@ -52,18 +51,16 @@ super(handler, new SynchUIModel()); } + @Override public SynchUIModel getModel() { return (SynchUIModel) model; } + @Override protected AbstractSynchUIHandler getHandler() { return (AbstractSynchUIHandler) handler; } - protected void doAllAction(VCSAction action) { - getModel().doAllAction(action); - } - public AbstractVCSPopup getPopup(VCSEntryLocation modelName) { switch (modelName) { case ALL: @@ -77,4 +74,8 @@ } throw new IllegalStateException("no popup found for " + modelName); } + + protected void doAction(VCSAction action, boolean useSelection) { + getHandler().doAction(action, useSelection); + } } \ No newline at end of file Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractTabUI.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractTabUI.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractTabUI.java 2008-04-06 15:16:51 UTC (rev 407) @@ -49,15 +49,14 @@ public abstract CardLayout getCardLayout(); - public AbstractTabUI(AbstractTabUIHandler handler, AbstractTabUIModel model) { - super(handler, model); - } - public AbstractTabUI() { - // for jaxx but never used super(); } + public AbstractTabUI(AbstractTabUIHandler handler, AbstractTabUIModel model) { + super(handler, model); + } + public AbstractTabUIModel getModel() { return (AbstractTabUIModel) model; } Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java 2008-04-06 15:16:51 UTC (rev 407) @@ -14,8 +14,8 @@ */ package org.codelutin.vcs.ui; +import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.ui.handler.VCSAbsractAction; -import org.codelutin.vcs.type.VCSAction; import javax.swing.JMenuItem; import java.awt.event.ActionEvent; @@ -46,4 +46,5 @@ ActionEvent e = new ActionEvent(item, 1, action.name()); dispatchAction.actionPerformed(e); } + } Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/UIHelper.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/UIHelper.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/UIHelper.java 2008-04-06 15:16:51 UTC (rev 407) @@ -14,11 +14,11 @@ */ package org.codelutin.vcs.ui; +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JRootPane; -import javax.swing.Action; -import javax.swing.AbstractAction; -import javax.swing.JComponent; import javax.swing.KeyStroke; import java.awt.event.ActionEvent; @@ -28,9 +28,9 @@ * @author chemit */ public class UIHelper { + public static void setQuitAction(final JDialog ui) { JRootPane rootPane = ui.getRootPane(); - //rootPane.setDefaultButton(accept); Action quitAction = new AbstractAction("quit") { private static final long serialVersionUID = -869095664995763057L; Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java 2008-04-06 15:16:51 UTC (rev 407) @@ -34,6 +34,7 @@ TagManager.registerDefaultNamespace("AbstractSynchUI", "org.codelutin.vcs.ui.*"); TagManager.registerDefaultNamespace("AbstractDiffUI", "org.codelutin.vcs.ui.*"); TagManager.registerDefaultNamespace("AbstractVCSPopup", "org.codelutin.vcs.ui.*"); + TagManager.registerDefaultNamespace("JVCSPopup", "org.codelutin.vcs.ui.*"); } } \ No newline at end of file Deleted: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java 2008-04-06 15:16:51 UTC (rev 407) @@ -1,67 +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; - -import static org.codelutin.i18n.I18n.n_; - -/** @author chemit */ -public class VCSUIConstants { - - /** columns names for a simple table model with module, file and status */ - public static final String[] SIMPLE_COLUMNS_NAMES = new String[]{ - n_("lutinvcs.module"), - n_("lutinvcs.file"), - n_("lutinvcs.status") - }; - - /** model name for synchronize ui */ - public static final String SYNCH_MODEL_PROPERTY = "modelSynch"; - - /** model name for confirm ui */ - public static final String CONFIRM_MODEL_PROPERTY = "modelConfirm"; - - /** model name for diff ui */ - public static final String DIFF_MODEL_PROPERTY = "modelConfirm"; - - public static final String ACTION_PROPERTY_CHANGED = "action"; - - public static final String MESSAGE_HISTORY_PROPERTY_CHANGED = "historyMessage"; - - public static final String FILE_PROPERTY_CHANGED = "file"; - - public static final String NEXT_DIFF_PROPERTY_CHANGED = "nextDiff"; - - public static final String PREVIOUS_DIFF_PROPERTY_CHANGED = "previousDiff"; - - public static final String REFRESH_PROPERTY_CHANGED = "refresh"; - - 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"; -} Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractConfirmUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractConfirmUIHandler.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractConfirmUIHandler.java 2008-04-06 15:16:51 UTC (rev 407) @@ -17,7 +17,6 @@ import org.codelutin.vcs.VCSEntry; import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.ui.AbstractUI; -import org.codelutin.vcs.ui.VCSUIConstants; import org.codelutin.vcs.ui.model.AbstractVCSEntriesTableModel; import org.codelutin.vcs.ui.model.ConfirmUIModel; @@ -41,12 +40,12 @@ } String action = evt.getPropertyName(); - if (VCSUIConstants.ACTION_PROPERTY_CHANGED.equals(action)) { + if (ConfirmUIModel.ACCEPT_PROPERTY_CHANGED.equals(action)) { updateUI(); return; } - if (VCSUIConstants.MESSAGE_HISTORY_PROPERTY_CHANGED.equals(action)) { + if (ConfirmUIModel.MESSAGE_HISTORY_PROPERTY_CHANGED.equals(action)) { updateMessageUI(); return; } Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractDiffUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractDiffUIHandler.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractDiffUIHandler.java 2008-04-06 15:16:51 UTC (rev 407) @@ -18,7 +18,6 @@ import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.type.VCSEntryLocation; import org.codelutin.vcs.ui.AbstractDiffUI; -import org.codelutin.vcs.ui.VCSUIConstants; import org.codelutin.vcs.ui.model.DiffUIModel; import java.beans.PropertyChangeEvent; @@ -32,7 +31,7 @@ //} String action = evt.getPropertyName(); - if (VCSUIConstants.FILE_PROPERTY_CHANGED.equals(action)) { + if (DiffUIModel.FILE_PROPERTY_CHANGED.equals(action)) { doSelectFile((VCSEntry) evt.getNewValue()); } else { super.propertyChange(evt); Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractSynchUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractSynchUIHandler.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractSynchUIHandler.java 2008-04-06 15:16:51 UTC (rev 407) @@ -26,13 +26,13 @@ /** @author chemit */ public abstract class AbstractSynchUIHandler<U extends AbstractSynchUI> extends AbstractTabUIHandler<SynchUIModel, U> { - public abstract void doAllAction(VCSAction action); + public abstract void doAction(VCSAction action, boolean useSelect); public void doSelectLocation(VCSEntryLocation location) { super.doSelectLocation(location); - VCSAction[] actions = getModel().getModel().getActions((ListSelectionModel) null); + VCSAction[] actions = getModel().getEntriesModel().getActions((ListSelectionModel) null); List<String> acts = new ArrayList<String>(); for (VCSAction action : actions) { acts.add(action.name().toLowerCase()); Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractTabUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractTabUIHandler.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractTabUIHandler.java 2008-04-06 15:16:51 UTC (rev 407) @@ -16,7 +16,6 @@ import org.codelutin.vcs.type.VCSEntryLocation; import org.codelutin.vcs.ui.AbstractTabUI; -import org.codelutin.vcs.ui.VCSUIConstants; import org.codelutin.vcs.ui.model.AbstractTabUIModel; import javax.swing.ListSelectionModel; @@ -45,14 +44,14 @@ //} String action = evt.getPropertyName(); - if (VCSUIConstants.TAB_PROPERTY_CHANGED.equals(action)) { + if (AbstractTabUIModel.LOCATION_PROPERTY_CHANGED.equals(action)) { doSelectLocation((VCSEntryLocation) evt.getNewValue()); } } public void doSelectLocation(VCSEntryLocation location) { log.info(location); - getUi().getCardLayout().show(getUi().getPreview(), location.name().toLowerCase() + "Content"); + getUi().getCardLayout().show(getUi().getPreview(), "tab" + location.name().toLowerCase()); } Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractUIHandler.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/handler/AbstractUIHandler.java 2008-04-06 15:16:51 UTC (rev 407) @@ -44,7 +44,7 @@ } public VCSEntryLocation getLocation() { - return getModel().getModel().getLocation(); + return getModel().getEntriesModel().getLocation(); } protected VCSActionManager getActionManager() { Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/AbstractTabUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/AbstractTabUIModel.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/AbstractTabUIModel.java 2008-04-06 15:16:51 UTC (rev 407) @@ -15,19 +15,20 @@ package org.codelutin.vcs.ui.model; import org.codelutin.vcs.type.VCSEntryLocation; -import org.codelutin.vcs.ui.VCSUIConstants; /** - * Model of a repository + * Abstract for a dialog with location information (says one tab by location type (except UNKNOW type of course...) * * @author chemit */ public class AbstractTabUIModel extends AbstractUIModel { + public static final String LOCATION_PROPERTY_CHANGED = "location"; + public void setLocation(VCSEntryLocation location) { - VCSEntryLocation oldLocation = getModel().getLocation(); - getModel().setLocation(location); - firePropertyChange(VCSUIConstants.TAB_PROPERTY_CHANGED, oldLocation, location); + VCSEntryLocation oldLocation = getEntriesModel().getLocation(); + getEntriesModel().setLocation(location); + firePropertyChange(LOCATION_PROPERTY_CHANGED, oldLocation, location); } } \ No newline at end of file Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/AbstractUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/AbstractUIModel.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/AbstractUIModel.java 2008-04-06 15:16:51 UTC (rev 407) @@ -18,10 +18,8 @@ import org.apache.commons.logging.LogFactory; import org.codelutin.vcs.VCSConnexion; import org.codelutin.vcs.VCSEntry; -import org.codelutin.vcs.type.VCSEntryLocation; -import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.VCSException; -import org.codelutin.vcs.ui.VCSUIConstants; +import org.codelutin.vcs.type.VCSEntryLocation; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -33,48 +31,36 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static protected final Log log = LogFactory.getLog(AbstractUIModel.class); - /** current action to be fired */ - protected VCSAction action; /** support for change properties support */ protected PropertyChangeSupport changeSupport; - protected final AbstractVCSEntriesTableModel model; + protected final AbstractVCSEntriesTableModel entriesModel; protected AbstractUIModel() { - model = new SimpleVCSEntriesTableModelImpl(getClass().getSimpleName()); + entriesModel = new SimpleVCSEntriesTableModelImpl(getClass().getSimpleName()); } - public AbstractVCSEntriesTableModel getModel() { - return model; + public AbstractVCSEntriesTableModel getEntriesModel() { + return entriesModel; } public void populate(VCSConnexion connexion) throws VCSException { - getModel().populate(connexion, System.nanoTime()); + getEntriesModel().populate(connexion, System.nanoTime()); } public void populate(VCSConnexion connexion, List<String> relativeLocalPaths, VCSEntryLocation location) throws VCSException { - getModel().populate(connexion, relativeLocalPaths, location, System.nanoTime()); + getEntriesModel().populate(connexion, relativeLocalPaths, location, System.nanoTime()); } public void populate(VCSEntryLocation location, VCSEntry[] datas) { - getModel().populate(location, datas); + getEntriesModel().populate(location, datas); } public void refresh(List<VCSEntry> entries) { - getModel().refresh(entries, System.nanoTime()); + getEntriesModel().refresh(entries, System.nanoTime()); } - public VCSAction getAction() { - return action; - } - - public void setAction(VCSAction action) { - VCSAction oldAction = this.action; - this.action = action; - firePropertyChange(VCSUIConstants.ACTION_PROPERTY_CHANGED, oldAction, action); - } - public synchronized void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { if (listener == null) { return; Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/AbstractVCSEntriesTableModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/AbstractVCSEntriesTableModel.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/AbstractVCSEntriesTableModel.java 2008-04-06 15:16:51 UTC (rev 407) @@ -20,12 +20,12 @@ package org.codelutin.vcs.ui.model; import static org.codelutin.i18n.I18n._; -import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.VCSConnexion; import org.codelutin.vcs.VCSEntries; import org.codelutin.vcs.VCSEntry; +import org.codelutin.vcs.VCSException; +import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.type.VCSEntryLocation; -import org.codelutin.vcs.VCSException; import org.codelutin.vcs.type.VCSState; import org.codelutin.vcs.util.VCSEntriesImpl; Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/ConfirmUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/ConfirmUIModel.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/ConfirmUIModel.java 2008-04-06 15:16:51 UTC (rev 407) @@ -17,13 +17,12 @@ import org.codelutin.vcs.VCSEntry; import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.type.VCSEntryLocation; -import static org.codelutin.vcs.ui.VCSUIConstants.MESSAGE_HISTORY_PROPERTY_CHANGED; import java.util.ArrayList; import java.util.List; /** - * Model of a repository + * Model of a a confirmation of action on entries (single type of action possible) * * @author chemit */ @@ -32,6 +31,10 @@ /** history of commit messages */ protected List<String> commitMessages; + /** current action to be fired */ + protected VCSAction action; + public static final String ACCEPT_PROPERTY_CHANGED = "action"; + public static final String MESSAGE_HISTORY_PROPERTY_CHANGED = "historyMessage"; public List<String> getCommitMessages() { if (commitMessages == null) { @@ -40,6 +43,10 @@ return commitMessages; } + public VCSAction getAction() { + return action; + } + public void addCommitMessage(String commitMessage) { if (commitMessage != null && !commitMessage.isEmpty() && !getCommitMessages().contains(commitMessage)) { // add message in history @@ -49,11 +56,15 @@ } public void init(VCSAction action, VCSEntryLocation location, VCSEntry[] states) { - // always reset action in order to allow propagation of action changed - this.action = null; - model.clear(); - model.populate(location, states); + getEntriesModel().clear(); + getEntriesModel().populate(location, states); setAction(action); } + public void setAction(VCSAction action) { + this.action = action; + // null oldValue to ensure propagation of changed + firePropertyChange(ACCEPT_PROPERTY_CHANGED, null, action); + } + } \ No newline at end of file Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/DiffPanelUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/DiffPanelUIModel.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/DiffPanelUIModel.java 2008-04-06 15:16:51 UTC (rev 407) @@ -16,9 +16,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.VCSEntry; import org.codelutin.vcs.VCSHandler; +import org.codelutin.vcs.type.VCSAction; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -31,7 +31,6 @@ */ public class DiffPanelUIModel { - /** to use log facility, just put in your code: log.info(\"...\"); */ static protected final Log log = LogFactory.getLog(DiffPanelUIModel.class); /** local root : wroking copy */ Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java 2008-04-06 15:16:51 UTC (rev 407) @@ -15,7 +15,6 @@ package org.codelutin.vcs.ui.model; import org.codelutin.vcs.VCSEntry; -import org.codelutin.vcs.ui.VCSUIConstants; /** * Model of a repository @@ -24,13 +23,15 @@ */ public class DiffUIModel extends AbstractTabUIModel { + public static final String FILE_PROPERTY_CHANGED = "file"; + /** current file displayed */ protected VCSEntry fileModel; public void setFileModel(VCSEntry fileModel) { VCSEntry oldFileModel = this.fileModel; this.fileModel = fileModel; - firePropertyChange(VCSUIConstants.TAB_PROPERTY_CHANGED, oldFileModel, fileModel); + firePropertyChange(FILE_PROPERTY_CHANGED, oldFileModel, fileModel); } public VCSEntry getFileModel() { Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/SimpleVCSEntriesTableModelImpl.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/SimpleVCSEntriesTableModelImpl.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/SimpleVCSEntriesTableModelImpl.java 2008-04-06 15:16:51 UTC (rev 407) @@ -16,16 +16,21 @@ import org.codelutin.vcs.VCSEntry; import org.codelutin.vcs.type.VCSState; -import org.codelutin.vcs.ui.VCSUIConstants; /** @author chemit */ public class SimpleVCSEntriesTableModelImpl extends AbstractVCSEntriesTableModel { private static final long serialVersionUID = -6397327068709720165L; - protected SimpleVCSEntriesTableModelImpl(String name) { + /** columns names for a simple table model with module, file and status */ + public static final String[] SIMPLE_COLUMNS_NAMES = new String[]{ + org.codelutin.i18n.I18n.n_("lutinvcs.module"), + org.codelutin.i18n.I18n.n_("lutinvcs.file"), + org.codelutin.i18n.I18n.n_("lutinvcs.status") + }; - super(name, VCSUIConstants.SIMPLE_COLUMNS_NAMES); + public SimpleVCSEntriesTableModelImpl(String name) { + super(name, SIMPLE_COLUMNS_NAMES); } public Object getValueAt(int rowIndex, int columnIndex) { Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java 2008-04-06 13:54:13 UTC (rev 406) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java 2008-04-06 15:16:51 UTC (rev 407) @@ -14,8 +14,6 @@ */ package org.codelutin.vcs.ui.model; -import org.codelutin.vcs.type.VCSAction; - /** * Model of a repository * @@ -23,10 +21,5 @@ */ public class SynchUIModel extends AbstractTabUIModel { - public void doAllAction(VCSAction action) { - setAction(action); - firePropertyChange(action.name().toLowerCase() + "All", null, model); - } - }