commit ffe159952e3b4384d21c34a11ecba0732755fd4e
author Alex Ruiz <alruiz@google.com> Sat Apr 16 17:42:29 2011 +0000
committer Alex Ruiz <alruiz@google.com> Sat Apr 16 17:42:29 2011 +0000
tree 9e5b66940688afa92849ca303b29da348b11566c
parent fe2e8db3005118ebf2e59947c2a3b1a1898a47fc

Fixed: [Issue 21] ProtobufQualifiedNameProvider assumes package names do not contain dots.
http://code.google.com/p/protobuf-dt/issues/detail?id=21

Code cleanup.

com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider.java

diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider.java
index 5e77a2f..a45f1bb 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider.java
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/naming/ProtobufQualifiedNameProvider.java
@@ -47,13 +47,10 @@
   }
 
   private boolean qualifiedNameContainsPackageName(List<String> qualifiedNameSegments, String[] packageNameSegments) {
-    int fqnLength = qualifiedNameSegments.size();
-    int packageSegmentCount = packageNameSegments.length;
-    if (fqnLength <= packageSegmentCount) return false;
-    for (int i = 0; i < fqnLength; i++) {
-      if (i == packageSegmentCount) break;
+    int packageNameSegmentCount = packageNameSegments.length;
+    if (qualifiedNameSegments.size() <= packageNameSegmentCount) return false;
+    for (int i = 0; i < packageNameSegmentCount; i++)
       if (!qualifiedNameSegments.get(i).equals(packageNameSegments[i])) return false;
-    }
     return true;
   }
 }