1.1 --- a/vcscore/src/org/netbeans/modules/vcscore/VcsFileSystem.java Mon Jul 25 14:13:09 2005 +0000
1.2 +++ b/vcscore/src/org/netbeans/modules/vcscore/VcsFileSystem.java Mon Jul 25 14:14:12 2005 +0000
1.3 @@ -21,8 +21,6 @@
1.4 import java.lang.ref.Reference;
1.5 import java.text.*;
1.6 import java.util.*;
1.7 -import java.util.regex.Pattern;
1.8 -import java.util.regex.PatternSyntaxException;
1.9 import javax.swing.*;
1.10 import javax.swing.event.ChangeEvent;
1.11 import javax.swing.event.ChangeListener;
1.12 @@ -30,28 +28,20 @@
1.13 import org.openide.*;
1.14 import org.openide.util.actions.*;
1.15 import org.openide.util.NbBundle;
1.16 -import org.openide.filesystems.FileChangeListener;
1.17 import org.openide.filesystems.FileObject;
1.18 import org.openide.filesystems.FileSystem;
1.19 -import org.openide.filesystems.FileSystem.Status;
1.20 import org.openide.filesystems.FileUtil;
1.21 import org.openide.filesystems.FileStateInvalidException;
1.22 import org.openide.filesystems.AbstractFileSystem;
1.23 -import org.openide.filesystems.DefaultAttributes;
1.24 import org.openide.filesystems.FileStatusEvent;
1.25 -import org.openide.filesystems.Repository;
1.26 -import org.openide.loaders.DataLoader;
1.27 -import org.openide.loaders.DataLoaderPool;
1.28 import org.openide.loaders.DataObject;
1.29 import org.openide.loaders.DataObjectNotFoundException;
1.30 import org.openide.loaders.DataShadow;
1.31 import org.openide.nodes.Node;
1.32 -import org.openide.nodes.Children;
1.33 import org.openide.util.RequestProcessor;
1.34 import org.openide.util.Utilities;
1.35 import org.openide.util.SharedClassObject;
1.36 import org.openide.util.UserQuestionException;
1.37 -import org.openide.util.WeakListener;
1.38 import org.openide.util.WeakListeners;
1.39 import org.openide.windows.InputOutput;
1.40
1.41 @@ -225,14 +215,11 @@
1.42 protected static final int REFRESH_TIME = 0; // Disabled by default (see #28352).
1.43 protected volatile int refreshTimeToSet = REFRESH_TIME;
1.44
1.45 - private static final String LOCAL_FILES_ADD_VAR = "SHOWLOCALFILES"; // NOI18N
1.46 private static final String LOCK_FILES_ON = "LOCKFILES"; // NOI18N
1.47 private static final String PROMPT_FOR_LOCK_ON = "PROMPTFORLOCK"; // NOI18N
1.48 private static final String EDIT_FILES_ON = "CALLEDITONFILES"; // NOI18N
1.49 private static final String PROMPT_FOR_EDIT_ON = "PROMPTFOREDIT"; // NOI18N
1.50
1.51 - private static final String DEFAULT_QUOTING_VALUE = "\\\""; // NOI18N
1.52 -
1.53 private static final String DEFAULT_CACHE_ID = "VCS_Cache"; // NOI18N
1.54
1.55 private static final String FILE_PROMPT_PREFIX = "tmppf"; // NOI18N
1.56 @@ -1030,17 +1017,17 @@
1.57 public void run() {
1.58 FileObject fo = findExistingResource(path);
1.59 if (fo == null) return;
1.60 - Enumeration enum = existingFileObjects(fo);
1.61 + Enumeration en = existingFileObjects(fo);
1.62 //Enumeration enum = fo.getChildren(recursively);
1.63 HashSet hs = new HashSet();
1.64 - if (enum.hasMoreElements()) {
1.65 + if (en.hasMoreElements()) {
1.66 // First add the root FileObject
1.67 - hs.add(enum.nextElement());
1.68 + hs.add(en.nextElement());
1.69 }
1.70 - while(enum.hasMoreElements()) {
1.71 + while(en.hasMoreElements()) {
1.72 //fo = (FileObject) enum.nextElement();
1.73 //hs.add(fo);
1.74 - FileObject chfo = (FileObject) enum.nextElement();
1.75 + FileObject chfo = (FileObject) en.nextElement();
1.76 if (!recursively && !fo.equals(chfo.getParent())) break;
1.77 hs.add(chfo);
1.78 }
1.79 @@ -1078,12 +1065,12 @@
1.80 * @return The set of FileObjects
1.81 */
1.82 private Set findExistingResources(Collection names) {
1.83 - Enumeration enum = existingFileObjects(getRoot());
1.84 + Enumeration en = existingFileObjects(getRoot());
1.85 Set fos = new HashSet();
1.86 int n = names.size();
1.87 int i = 0;
1.88 - while (enum.hasMoreElements() && i < n) {
1.89 - FileObject obj = (FileObject) enum.nextElement();
1.90 + while (en.hasMoreElements() && i < n) {
1.91 + FileObject obj = (FileObject) en.nextElement();
1.92 String name = obj.getPath();
1.93 if (names.contains(name)) {
1.94 fos.add(obj);
1.95 @@ -1099,10 +1086,10 @@
1.96 * FileObjects and search them for the desired one.
1.97 */
1.98 public FileObject findExistingResource(String name) {
1.99 - Enumeration enum = existingFileObjects(getRoot());
1.100 + Enumeration en = existingFileObjects(getRoot());
1.101 FileObject fo = null;
1.102 - while (enum.hasMoreElements()) {
1.103 - FileObject obj = (FileObject) enum.nextElement();
1.104 + while (en.hasMoreElements()) {
1.105 + FileObject obj = (FileObject) en.nextElement();
1.106 if (name.equals(obj.getPath())) {
1.107 fo = obj;
1.108 break;
1.109 @@ -1121,7 +1108,7 @@
1.110 VcsConfigVariable schVar = (VcsConfigVariable) variablesByName.get(VAR_STATUS_SCHEDULED_ADD);
1.111 String scheduledStatusAdd = (schVar != null) ? schVar.getValue() : null;
1.112 schVar = (VcsConfigVariable) variablesByName.get(VAR_STATUS_SCHEDULED_REMOVE);
1.113 - String scheduledStatusRemove = (schVar != null) ? schVar.getValue() : null;
1.114 +// String scheduledStatusRemove = (schVar != null) ? schVar.getValue() : null;
1.115 //System.out.println("checkScheduledStates(): scheduledStatusAdd = "+scheduledStatusAdd+", scheduledStatusRemove = "+scheduledStatusRemove);
1.116 for (Iterator it = fos.iterator(); it.hasNext(); ) {
1.117 FileObject fo = (FileObject) it.next();
1.118 @@ -2335,7 +2322,7 @@
1.119 private String mergeStatus(Object[] fileObjects) {
1.120 String mergedStatus = null;
1.121 int len = fileObjects.length;
1.122 - for (int i = 0; i < fileObjects.length; i++) {
1.123 + for (int i = 0; i < len; i++) {
1.124 FileObject fo = (FileObject) fileObjects[i];
1.125 FileProperties fprops = Turbo.getCachedMeta(fo);
1.126 if (mergedStatus == null) {
1.127 @@ -2933,18 +2920,6 @@
1.128
1.129 }
1.130
1.131 - private static boolean areOnlyHiddenFiles(String[] files) {
1.132 - ArrayList fileList = new ArrayList(Arrays.asList(files));
1.133 - fileList.remove(".nbintdb"); // NOI18N
1.134 - fileList.remove(".nbattrs"); // NOI18N
1.135 - fileList.remove("fileSystem.attributes"); // NOI18N
1.136 - for (int i = 0; i < fileList.size(); i++) {
1.137 - String file = (String) fileList.get(i);
1.138 - if (file.endsWith("~")) fileList.remove(i--); // NOI18N
1.139 - }
1.140 - return fileList.size() == 0;
1.141 - }
1.142 -
1.143 private transient Vector scheduledFilesToBeProcessed;
1.144
1.145 /**
1.146 @@ -3139,9 +3114,9 @@
1.147 //System.out.println("checkForModifications("+path+")");
1.148 if (".".equals(path)) path = "";
1.149 FileObject first = this.findResource(path);
1.150 - Enumeration enum = existingFileObjects(first);
1.151 - while(enum.hasMoreElements()) {
1.152 - FileObject fo = (FileObject) enum.nextElement();
1.153 + Enumeration en = existingFileObjects(first);
1.154 + while(en.hasMoreElements()) {
1.155 + FileObject fo = (FileObject) en.nextElement();
1.156 if (!(fo.isData() && refreshData || fo.isFolder() && refreshFolders)) {
1.157 continue;
1.158 }
1.159 @@ -3558,8 +3533,6 @@
1.160 * @return true if the file is folder, false otherwise
1.161 */
1.162 public boolean folder (String name) {
1.163 - boolean isFolder;
1.164 -
1.165 File f = getFile (name);
1.166 if (f != null && f.exists()) {
1.167 return f.isDirectory ();
1.168 @@ -3676,10 +3649,6 @@
1.169 }
1.170 }
1.171
1.172 - private synchronized void resetFileChangeHandlers() {
1.173 - fileChangeHandlers = null;
1.174 - }
1.175 -
1.176 private synchronized void callFileChangeHandler(String name, String status) {
1.177 if (fileChangeHandlers == null) {
1.178 fileChangeHandlers = collectFileChangeHandlers();
1.179 @@ -4451,6 +4420,7 @@
1.180 }
1.181
1.182 private class SettingsPropertyChangeListener implements PropertyChangeListener {
1.183 + public SettingsPropertyChangeListener () {}
1.184 public void propertyChange(final PropertyChangeEvent event) {
1.185 settingsChanged(event.getPropertyName(), event.getOldValue(), event.getNewValue());
1.186 }
1.187 @@ -4459,6 +4429,8 @@
1.188 private class VcsList implements AbstractFileSystem.List {
1.189
1.190 private static final long serialVersionUID = 9164232967348550668L;
1.191 +
1.192 + public VcsList () {}
1.193
1.194 public String[] children(String name) {
1.195 return list.children(name);
1.196 @@ -4473,6 +4445,8 @@
1.197 * a multifilesystem.
1.198 */
1.199 private class RegistryListener extends Object implements FSRegistryListener {
1.200 +
1.201 + public RegistryListener () {}
1.202
1.203 public void fsAdded(org.netbeans.modules.vcscore.registry.FSRegistryEvent ev) {
1.204 if (VcsFileSystem.this.equals(ev.getInfo().getExistingFileSystem())) {