[ jEdit-CVS ] plugins/RubyPlugin/src/org/jedit/ruby/ri RDocViewer.java,1.9,1.10 RiParser.java,1.11,1.12

[Robert M. <rob...@us...>]

Update of /cvsroot/jedit/plugins/RubyPlugin/src/org/jedit/ruby/ri
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6348/org/jedit/ruby/ri

Modified Files:
	RDocViewer.java RiParser.java 
Log Message:
worked on singleton/class method completion

Index: RiParser.java
===================================================================
RCS file: /cvsroot/jedit/plugins/RubyPlugin/src/org/jedit/ruby/ri/RiParser.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- RiParser.java	6 Nov 2005 00:25:45 -0000	1.11
+++ RiParser.java	6 Nov 2005 23:59:53 -0000	1.12
@@ -44,7 +44,7 @@
         for (JarEntry entry : entries) {
             loadClassDesciption(entry);
         }
-        RubyCache.instance().populateSuperclassMethods();
+        RubyCache.instance().populateSuperClassMethods();
     }
 
     private static List<String> getRDocExcludePatterns() {
@@ -151,7 +151,7 @@
 
     private static void cache(ClassDescription description, String path) {
         ClassMember parent = new ClassMember(description.getName());
-        parent.setParentMemberName(description.getSuperclass());
+        parent.setSuperClassName(description.getSuperclass());
         parent.setEndOffset(0);
         String namespace = description.getNamespace();
         if(namespace != null && namespace.trim().length() > 0) {
@@ -164,7 +164,7 @@
         addMethods(description.getClassMethods(), parent);
         Member[] members = new Member[1];
         members[0] = parent;
-        RubyMembers rubyMembers = new RubyMembers(members, new ArrayList<Problem>());
+        RubyMembers rubyMembers = new RubyMembers(members, new ArrayList<Problem>(), 0);
         RubyCache.instance().addMembers(rubyMembers, path);
     }
 

Index: RDocViewer.java
===================================================================
RCS file: /cvsroot/jedit/plugins/RubyPlugin/src/org/jedit/ruby/ri/RDocViewer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- RDocViewer.java	6 Nov 2005 00:25:45 -0000	1.9
+++ RDocViewer.java	6 Nov 2005 23:59:53 -0000	1.10
@@ -117,12 +117,14 @@
     }
 
     private void setListData(final List members) {
-        resultList.setModel (
-            new AbstractListModel() {
-                public int getSize() { return members.size(); }
-                public Object getElementAt(int i) { return members.get(i); }
-            }
-        );
+        if (resultList.getModel() == null || resultList.getModel().getSize() != members.size()) {
+            resultList.setModel (
+                new AbstractListModel() {
+                    public int getSize() { return members.size(); }
+                    public Object getElementAt(int i) { return members.get(i); }
+                }
+            );
+        }
     }
 
     public final void focusOnDefaultComponent() {