Author: tchemit Date: 2008-05-17 11:32:35 +0000 (Sat, 17 May 2008) New Revision: 673 Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/ConnexionConfigUI.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ConnexionConfigUIHandler.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/model/ConnexionConfigUIModel.java Log: ajout modulePath dans la config Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/ConnexionConfigUI.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/ConnexionConfigUI.java 2008-05-17 11:32:26 UTC (rev 672) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/ConnexionConfigUI.java 2008-05-17 11:32:35 UTC (rev 673) @@ -24,11 +24,13 @@ import javax.swing.AbstractButton; import javax.swing.ButtonGroup; import javax.swing.JCheckBox; +import javax.swing.JComboBox; import javax.swing.JEditorPane; -import javax.swing.JLabel; +import javax.swing.JPanel; import javax.swing.JPasswordField; import javax.swing.JRadioButton; import javax.swing.JTextField; +import java.awt.CardLayout; import java.io.File; /** @author chemit */ @@ -72,33 +74,20 @@ public abstract JTextField getWorkingCopyFile(); - public abstract JLabel getLoginLabel(); + public abstract JTextField getModulePath(); - public abstract JLabel getSshLoginLabel(); + public abstract JPanel getConnexionPanel(); - public abstract JLabel getPasswordLabel(); + public abstract CardLayout getConnexionPanelLayout(); - public abstract JLabel getSshPassphraseLabel(); + public abstract JPanel getAnonymousPanel(); - //public abstract JLabel getSshNoPassphraseLabel(); + public abstract JPanel getPasswordPanel(); - public abstract JLabel getSshPrivateKeyFileLabel(); + public abstract JPanel getSshPanel(); - public abstract JLabel getWorkingCopyFileLabel(); + public abstract JComboBox getRootsList(); - public abstract javax.swing.JPanel getConnexionPanel(); - - public abstract java.awt.CardLayout getConnexionPanelLayout(); - - public abstract javax.swing.JPanel getAnonymousPanel(); - - public abstract javax.swing.JPanel getPasswordPanel(); - - public abstract javax.swing.JPanel getSshPanel(); - - public abstract javax.swing.JComboBox getRootsList(); - - protected void changeAutheticationMode(VCSConnexionMode mode) { getHandler().getModel().setConnexionMode(mode); doCheck(VCSConnexionConfigProperty.connexionMode); @@ -125,19 +114,19 @@ } protected void generateKey() { - //TODO + log.info("TODO " + this); } protected void editRoot() { - //TODO + log.info("TODO " + this); } protected void addRoot() { - //TODO + log.info("TODO " + this); } protected void deleteRoot() { - //TODO + log.info("TODO " + this); } } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ConnexionConfigUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ConnexionConfigUIHandler.java 2008-05-17 11:32:26 UTC (rev 672) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ConnexionConfigUIHandler.java 2008-05-17 11:32:35 UTC (rev 673) @@ -86,11 +86,10 @@ public void doCheck(VCSConnexionConfigProperty key) { switch (key) { - case connexionMode: // special case (not checkable property) doCheck(getModel().getMode()); - break; + return; case sshNoPassphrase: Boolean noPass = (Boolean) getUi().getElementValue(key); getModel().setNoSshPassPhrase(noPass); @@ -98,22 +97,13 @@ if (noPass) { getModel().clear(sshPassphrase); } //else { - super.doCheck(sshPassphrase); + super.doCheck(sshPassphrase); //} - break; - case login: - case password: - case rootConfig: - case sshLogin: - case sshPassphrase: - case sshPrivateKeyFile: - case workingCopyFile: - super.doCheck(key); - break; - case typeRepo: - case typeRepoValue: - break; - } + return; + } + // other properties use default behaviour + super.doCheck(key); + } protected boolean doCheck(VCSConnexionMode value) { @@ -137,13 +127,7 @@ return result; } - @Override - public void doCheckAll() { - super.doCheckAll(); - } - - @Override protected void populateUI() { super.populateUI(); @@ -193,7 +177,6 @@ modifieds.add(VCSConnexionConfigProperty.sshPassphrase); } } - } return b; } @@ -210,7 +193,6 @@ ui.getConnexionModePassword().setSelected(true); break; case SSH: - doCheck(sshLogin); doCheck(sshNoPassphrase); doCheck(sshPassphrase); Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/model/ConnexionConfigUIModel.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/model/ConnexionConfigUIModel.java 2008-05-17 11:32:26 UTC (rev 672) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/model/ConnexionConfigUIModel.java 2008-05-17 11:32:35 UTC (rev 673) @@ -51,10 +51,7 @@ public void populate(Object src) { current.copyFrom(src, EnumSet.of(sshNoPassphrase)); noSshPassPhrase = current.isSshNoPassphrase(); - super.populate(src); - /*if (noSshPassPhrase) { - clear(sshPassphrase); - }*/ + super.populate(src); setConnexionMode(current.getConnexionMode()); } @@ -87,7 +84,6 @@ } } changeModifiedState(connexionMode, mode, getCurrent().getConnexionMode()); - firePropertyChange(MODE_PROPERTY_CHANGED, oldMode, mode); setConnexionState(null); } @@ -145,6 +141,9 @@ result = !f.isEmpty() && new java.io.File(f).exists(); } break; + case modulePath: + result &= !String.valueOf(value).trim().isEmpty(); + break; case sshNoPassphrase: // always valid :) result = true;