Author: tchemit Date: 2008-05-26 07:43:57 +0000 (Mon, 26 May 2008) New Revision: 681 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 Log: improve rootConfig modification state 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-26 07:43:24 UTC (rev 680) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/ConnexionConfigUI.java 2008-05-26 07:43:57 UTC (rev 681) @@ -139,9 +139,12 @@ } private void afterRootChanged() { + String rootName = (String) getRootConfig().getSelectedItem(); getHandler().getModel().setRoots(VCSConfigFactory.getInstance().getRoots()); VCSConnexionConfig current = getHandler().getModel().getCurrent(); VCSRootConfig root = current.getRootConfig(); + boolean wasModified = getHandler().getModel().getModifieds().contains(VCSConnexionConfigProperty.rootConfig); + if (root!=null) { // check root always exists if (!VCSConfigFactory.containsRoot(root.getRootName())) { @@ -153,7 +156,12 @@ } else { getHandler().populateRoots(false); } - - doCheck(VCSConnexionConfigProperty.rootConfig); + if (rootName!=null) { + getRootConfig().setSelectedItem(rootName); + } + if (!wasModified) { + getHandler().getModel().removeModified(VCSConnexionConfigProperty.rootConfig); + } + //doCheck(VCSConnexionConfigProperty.rootConfig); } } 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-26 07:43:24 UTC (rev 680) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/ConnexionConfigUIHandler.java 2008-05-26 07:43:57 UTC (rev 681) @@ -162,6 +162,7 @@ } ui.getTestConnection().setEnabled(true); getUi().getRootsModel().setSelectedItem(config.getRootConfig().getRootName()); + getModel().removeModified(VCSConnexionConfigProperty.rootConfig); } public void populateRoots(boolean addEmpty) {