[Jmol-commits] CVS: Jmol/src/org/jmol/viewer MouseManager10.java,1.3,1.4 FileManager.java,1.6,1.7

[Nico <ni...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/jmol/viewer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17239/src/org/jmol/viewer

Modified Files:
	MouseManager10.java FileManager.java 
Log Message:
Removed some warnings (Eclipse)

Index: MouseManager10.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/MouseManager10.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MouseManager10.java	7 Nov 2004 15:21:27 -0000	1.3
+++ MouseManager10.java	15 Nov 2004 22:49:58 -0000	1.4
@@ -39,7 +39,7 @@
     return ((modifiers & MIDDLE_RIGHT) == 0)  ? (modifiers | LEFT) : modifiers;
   }
 
-  int xWhenPressed, yWhenPressed, modifiersWhenPressed;
+  int xWhenPressed, yWhenPressed, modifiersWhenPressed10;
 
   boolean handleOldJvm10Event(Event e) {
     int x = e.x, y = e.y, modifiers = e.modifiers;
@@ -47,7 +47,7 @@
     modifiers = applyLeftMouse(modifiers);
     switch (e.id) {
     case Event.MOUSE_DOWN:
-      xWhenPressed = x; yWhenPressed = y; modifiersWhenPressed = modifiers;
+      xWhenPressed = x; yWhenPressed = y; modifiersWhenPressed10 = modifiers;
       mousePressed(time, x, y, modifiers, false);
       break;
     case Event.MOUSE_DRAG:
@@ -66,7 +66,7 @@
       mouseReleased(time, x, y, modifiers);
       // simulate a mouseClicked event for us
       if (x == xWhenPressed && y == yWhenPressed &&
-          modifiers == modifiersWhenPressed) {
+          modifiers == modifiersWhenPressed10) {
         // the underlying code will turn this into dbl clicks for us
         mouseClicked(time, x, y, modifiers, 1);
       }

Index: FileManager.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/FileManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileManager.java	15 Nov 2004 19:17:05 -0000	1.6
+++ FileManager.java	15 Nov 2004 22:49:58 -0000	1.7
@@ -377,18 +377,18 @@
   class FileOpenThread implements Runnable {
     boolean terminated;
     String errorMessage;
-    String fullPathName;
-    String nameAsGiven;
+    String fullPathNameInThread;
+    String nameAsGivenInThread;
     Object clientFile;
     Reader reader;
 
     FileOpenThread(String fullPathName, String nameAsGiven) {
-      this.fullPathName = fullPathName;
-      this.nameAsGiven = nameAsGiven;
+      this.fullPathNameInThread = fullPathName;
+      this.nameAsGivenInThread = nameAsGiven;
     }
 
     FileOpenThread(String name, Reader reader) {
-      nameAsGiven = fullPathName = name;
+      nameAsGivenInThread = fullPathNameInThread = name;
       this.reader = reader;
     }
 
@@ -396,17 +396,17 @@
       if (reader != null) {
         openReader(reader);
       } else {
-        Object t = getInputStreamOrErrorMessageFromName(nameAsGiven);
+        Object t = getInputStreamOrErrorMessageFromName(nameAsGivenInThread);
         if (! (t instanceof InputStream)) {
           errorMessage = (t == null
-                          ? "error opening:" + nameAsGiven
+                          ? "error opening:" + nameAsGivenInThread
                           : (String)t);
         } else {
-          openInputStream(fullPathName, fileName, (InputStream) t);
+          openInputStream(fullPathNameInThread, fileName, (InputStream) t);
         }
       }
       if (errorMessage != null)
-        System.out.println("error opening " + fullPathName + "\n" + errorMessage);
+        System.out.println("error opening " + fullPathNameInThread + "\n" + errorMessage);
       terminated = true;
     }
 
@@ -433,7 +433,7 @@
 
     private void openReader(Reader reader) {
       Object clientFile =
-        modelAdapter.openBufferedReader(fullPathName,
+        modelAdapter.openBufferedReader(fullPathNameInThread,
                                         new BufferedReader(reader));
       if (clientFile instanceof String)
         errorMessage = (String)clientFile;