? boston.diffs
Index: Bundle.properties
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/Bundle.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
88a89,91
> #ClassElementNodeFactory
> CTL_Class_name_format={C}
>
89a93
> ## 5 src-jtulach1.4 4/1/99 Jan Jancura Object browser support
Index: Bundle_ja.properties
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/Bundle_ja.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
12a13,14
>
>
13a16
>
22c25
< PROP_isExecutable=\u5b9f\u884c\u53ef\u80fd
---
> PROP_isExecutable=\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u3067\u3059
58c61
< HINT_executionSetName=\u5b9f\u884c\u306b\u95a2\u4fc2\u3059\u308b\u5c5e\u6027\u3002
---
> HINT_executionSetName=\u5b9f\u884c\u306b\u95a2\u4fc2\u3059\u308b\u30d7\u30ed\u30d1\u30c6\u30a3\u3002
60c63
< HINT_fileParams= main() \u30e1\u30bd\u30c3\u30c9 (\u7a7a\u767d\u533a\u5207\u308a\u6587\u5b57\u5217\u3068\u3057\u3066)\u3002
---
> HINT_fileParams= main() \u30e1\u30bd\u30c3\u30c9\u306e\u5f15\u6570 (\u7a7a\u767d\u533a\u5207\u308a\u6587\u5b57\u5217\u3068\u3057\u3066)\u3002
87c90
< HINT_throws=\u30b9\u30ed\u30fc\u4f8b\u5916\u3002
---
> HINT_throws=\u30b9\u30ed\u30fc\u3055\u308c\u305f\u4f8b\u5916\u3002
Index: ClassDataLoader.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/ClassDataLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
114,115c114,115
< protected MultiDataObject.Entry createPrimaryEntry (FileObject primaryFile) {
< return new FileEntry(primaryFile);
---
> protected MultiDataObject.Entry createPrimaryEntry (MultiDataObject obj, FileObject primaryFile) {
> return new FileEntry(obj, primaryFile);
124,125c124,125
< protected MultiDataObject.Entry createSecondaryEntry (FileObject secondaryFile) {
< return new FileEntry.Numb(secondaryFile);
---
> protected MultiDataObject.Entry createSecondaryEntry (MultiDataObject obj, FileObject secondaryFile) {
> return new FileEntry.Numb(obj, secondaryFile);
164a165,166
> * 5 Gandalf 1.4 3/14/99 Jaroslav Tulach Change of
> * MultiDataObject.Entry.
Index: ClassDataLoaderBeanInfo.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/ClassDataLoaderBeanInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
89a90,91
> * 5 src-jtulach1.4 10/23/99 Ian Formanek NO SEMANTIC CHANGE - Sun
> * Microsystems Copyright in File Comment
Index: ClassDataNode.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/ClassDataNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
29a30
> import com.netbeans.ide.src.ElementProperties;
40,43c41
< private final static String PROP_ISINTERFACE = "isInterface";
< private final static String PROP_SUPERCLASS = "superclass";
< private final static String PROP_MODIFIERS = "modifiers";
< private final static String PROP_CLASSNAME = "className";
---
> private final static String PROP_CLASS_NAME = "className";
45c43,48
< private final static String PROPERTY_SET_NAME = "Property";
---
> private final static String PROP_IS_JAVA_BEAN = "isJavaBean";
> private final static String PROP_IS_APPLET = "isApplet";
> private final static String PROP_IS_EXECUTABLE = "isExecutable";
> private final static String PROP_FILE_PARAMS = "fileParams";
> private final static String PROP_EXECUTION = "execution";
>
47,48d49
< private final static String PROP_FILE_PARAMS = "fileParams";
< private final static String PROP_EXECUTION = "execution";
145c146
< PROP_MODIFIERS,
---
> PROP_CLASS_NAME,
151,157c152
< Object result = null;
< try {
< result = obj.getClassName();
< } catch (IOException ex) {
< } catch (ClassNotFoundException ex) {
< }
< return result;
---
> return obj.getClassName();
161c156
< PROP_MODIFIERS,
---
> ElementProperties.PROP_MODIFIERS,
170,172c165,167
< } catch (ThreadDeath td) {
< throw td;
< } catch (Throwable t) {
---
> } catch (IOException ex) {
> // ignore - return null
> } catch (ClassNotFoundException ex) {
179c174
< PROP_SUPERCLASS,
---
> ElementProperties.PROP_SUPERCLASS,
188,190c183,185
< } catch (ThreadDeath td) {
< throw td;
< } catch (Throwable t) {
---
> } catch (IOException ex) {
> // ignore - return null
> } catch (ClassNotFoundException ex) {
197c192
< PROP_SUPERCLASS,
---
> PROP_IS_EXECUTABLE,
199,200c194,195
< bundle.getString ("PROP_hasMainMethod"),
< bundle.getString ("HINT_hasMainMethod")
---
> bundle.getString ("PROP_isExecutable"),
> bundle.getString ("HINT_isExecutable")
203,211c198
< boolean result = false;
< try {
< obj.getHasMainMethod();
< } catch (ThreadDeath td) {
< throw td;
< } catch (Throwable t) {
< // ignore - return null
< }
< return new Boolean (result);
---
> return new Boolean(obj.isExecutable());
215c202
< PROP_ISINTERFACE,
---
> ElementProperties.PROP_CLASS_OR_INTERFACE,
221,229c208
< boolean result = false;
< try {
< obj.isInterface();
< } catch (ThreadDeath td) {
< throw td;
< } catch (Throwable t) {
< // ignore - return null
< }
< return new Boolean (result);
---
> return new Boolean (obj.isInterface());
233c212
< PROP_SUPERCLASS,
---
> PROP_IS_APPLET,
239,247c218
< boolean result = false;
< try {
< obj.isApplet();
< } catch (ThreadDeath td) {
< throw td;
< } catch (Throwable t) {
< // ignore - return null
< }
< return new Boolean (result);
---
> return new Boolean (obj.isApplet());
251c222
< PROP_SUPERCLASS,
---
> PROP_IS_JAVA_BEAN,
257,265c228
< boolean result = false;
< try {
< obj.isJavaBean();
< } catch (ThreadDeath td) {
< throw td;
< } catch (Throwable t) {
< // ignore - return null
< }
< return new Boolean (result);
---
> return new Boolean (obj.isJavaBean());
404c367
< if (dataObj.getHasMainMethod ())
---
> if (dataObj.isExecutable ())
409c372
< if (dataObj.getHasMainMethod ())
---
> if (dataObj.isExecutable ())
413,415c376,378
< } catch (ThreadDeath td) {
< throw td;
< } catch (Throwable t) {
---
> } catch (IOException ex) {
> setIconBase(ERROR_BASE);
> } catch (ClassNotFoundException ex) {
468a432
> * 5 Gandalf 1.4 1/20/99 David Simonek rework of class DO
Index: ClassDataObject.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/ClassDataObject.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
79,83d78
< /** bundle to obtain text information from */
< //private static java.util.ResourceBundle bundle =
< // NbBundle.getBundle ("com.netbeans.developer.modules.locales.LoadersClazzBundle");
<
<
119,122c114,118
< } catch (ThreadDeath td) {
< throw td;
< } catch (Throwable t) {
< System.out.println ("Chytam vsechny excs.....");
---
> } catch (IOException ex) {
> System.out.println ("Chytam IOExc....");
> return;
> } catch (ClassNotFoundException ex) {
> System.out.println ("Chytam ClassNFExc...");
150,156c146
< try {
< return isJavaBean ();
< } catch (ThreadDeath td) {
< } catch (Throwable t) {
< // ignore and return false if some error
< }
< return false;
---
> return isJavaBean ();
275,280c265
< try {
< if (isApplet ()) return new AppletDebuggerInfo(getPrimaryFile());
< } catch (IOException ex) {
< } catch (ClassNotFoundException ex) {
< // ignore and return "normal" debugger info at least
< }
---
> if (isApplet ()) return new AppletDebuggerInfo(getPrimaryFile());
302c287
< public boolean isInterface () throws IOException, ClassNotFoundException {
---
> public boolean isInterface () {
314c299
< public String getClassName () throws IOException, ClassNotFoundException {
---
> public String getClassName () {
322c307
< public boolean getHasMainMethod () throws IOException, ClassNotFoundException {
---
> public boolean isExecutable () {
326c311
< public boolean isJavaBean () throws IOException, ClassNotFoundException {
---
> public boolean isJavaBean () {
330c315
< public boolean isApplet () throws IOException, ClassNotFoundException {
---
> public boolean isApplet () {
459a445
> * 5 Gandalf 1.4 1/20/99 David Simonek rework of class DO
Index: ClassElementImpl.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/ClassElementImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
318a319,321
> public Object readResolve() {
> return new ClassElement(this, (SourceElement)null);
> }
323a327
> * 5 src-jtulach1.4 2/17/99 Petr Hamernik serialization changed.
Index: ClassElementNodeFactory.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/ClassElementNodeFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
96,108c96,103
< ClassElementNode n =
< new ClassElementNode(element, tree ? Children.LEAF : createClassChildren(element), false);
< CookieSet cs = n.getCookieSet ();
< cs.add (new ElementCookie () {
< public Node getElementsParent () {
< ClassElementNode nn = new ClassElementNode (element, createClassChildren(element), false);
< CookieSet css = nn.getCookieSet ();
< css.add ((FilterCookie) nn.getChildren ());
< return nn;
< }
< });
< n.setActions(getDefaultActions());
< if (tree)
---
> ClassChildren ch = new ClassChildren(this, element);
>
> ClassElementNode n = new ClassElementNode(element, ch, false);
>
>
> if (tree) {
> CookieSet css = n.getCookieSet ();
> css.add ((FilterCookie) n.getChildren ());
111a107,118
>
> // filter out inner classes
> ClassElementFilter cel = new ClassElementFilter ();
> cel.setOrder (new int[] {
> ClassElementFilter.CONSTRUCTOR + ClassElementFilter.METHOD,
> ClassElementFilter.FIELD,
> });
> ch.setFilter (cel);
> }
>
> n.setActions(getDefaultActions());
>
115,122d121
< /** Method which creates children for class node.
< * @param element class element
< * @return children for the class element
< */
< protected Children createClassChildren(ClassElement element) {
< return new ClassChildren(getInstance(), element);
< }
<
143a143
> * 5 src-jtulach1.4 5/16/99 Jaroslav Tulach New hiearchy.
Index: ClassException.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/ClassException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
9,11c9,11
< * The Original Code is Forte for Java, Community Edition. The Initial
< * Developer of the Original Code is Sun Microsystems, Inc. Portions
< * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
---
> * The Original Code is NetBeans. The Initial Developer of the Original
> * Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun
> * Microsystems, Inc. All Rights Reserved.
Index: ClassJavaDocImpl.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/ClassJavaDocImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
24,31c24,31
<
< private static final JavaDocTag[] TAGS_EMPTY = new JavaDocTag[] {};
< private static final JavaDocTag.See[] SEE_TAGS_EMPTY = new JavaDocTag.See[] {};
< private static final JavaDocTag.Param[] PARAM_TAGS_EMPTY = new JavaDocTag.Param[] {};
< private static final JavaDocTag.Throws[] THROWS_TAGS_EMPTY = new JavaDocTag.Throws[] {};
< private static final JavaDocTag.SerialField[] SERIALFIELD_TAGS_EMPTY = new JavaDocTag.SerialField[] {};
<
< /** Creates new ClassJavaDocImpl */
---
>
> private static final JavaDocTag[] TAGS_EMPTY = new JavaDocTag[] {};
> private static final JavaDocTag.See[] SEE_TAGS_EMPTY = new JavaDocTag.See[] {};
> private static final JavaDocTag.Param[] PARAM_TAGS_EMPTY = new JavaDocTag.Param[] {};
> private static final JavaDocTag.Throws[] THROWS_TAGS_EMPTY = new JavaDocTag.Throws[] {};
> private static final JavaDocTag.SerialField[] SERIALFIELD_TAGS_EMPTY = new JavaDocTag.SerialField[] {};
>
> /** Creates new ClassJavaDocImpl */
33,115c33,106
< }
<
< /** Get the entire text of the comment.
< * @return the whole text
< */
< public String getRawText() {
< return ""; // NOI18N
< }
<
< /** Set the raw text of the comment.
< * @param s the whole text to set
< * @exception SourceException if the modification cannot be performed
< */
< public void setRawText(String s) throws SourceException {
< throw new SourceException();
< }
<
< /** Get the actual text, cleared of all (non-inline) tags.
< * @return the plain text
< */
< public String getText() {
< return ""; // NOI18N
< }
<
< /** Set the actual text.
< * @param s the actual text, without any (non-inline) tags
< * @exception SourceException if the modification cannot be performed
< */
< public void setText(String s) throws SourceException {
< throw new SourceException();
< }
<
< /** Clears the javadoc from the source.
< */
< public void clearJavaDoc() throws SourceException {
< throw new SourceException();
< }
<
< /** Test if this javadoc is empty.
< * @return true if it is not generated to the source.
< */
< public boolean isEmpty() {
< return true;
< }
<
< /** Gets all tags from comment.
< */
< public JavaDocTag[] getTags() {
< return TAGS_EMPTY;
< }
<
< /** Gets all tags of given name
< */
< public JavaDocTag[] getTags(String name) {
< return TAGS_EMPTY;
< }
<
< /** Adds removes or sets tags used in this comment
< * @param elems the new initializers
< * @param action {@link #ADD}, {@link #REMOVE}, or {@link #SET}
< * @exception SourceException if impossible
< */
< public void changeTags(JavaDocTag[] tags,int action) throws SourceException {
< throw new SourceException();
< }
<
< /** Gets all @see tags
< */
< public JavaDocTag.See[] getSeeTags() {
< return SEE_TAGS_EMPTY;
< }
<
< /** The JavaDoc of a class.
< * Class javadoc adds no special tags.
< */
< static class Class extends ClassJavaDocImpl implements JavaDoc.Class {
< }
<
< /** The JavaDoc of a field.
< * Currently adds special @SerialField tag
< */
< static class Field extends ClassJavaDocImpl implements JavaDoc.Field {
< /** Gets SerialField tags.
---
> }
>
> /** Get the entire text of the comment.
> * @return the whole text
> */
> public String getRawText() {
> return ""; // NOI18N
> }
>
> /** Set the raw text of the comment.
> * @param s the whole text to set
> * @exception SourceException if the modification cannot be performed
> */
> public void setRawText(String s) throws SourceException {
> throw new SourceException();
> }
>
> /** Get the actual text, cleared of all (non-inline) tags.
> * @return the plain text
> */
> public String getText() {
> return ""; // NOI18N
> }
>
> /** Set the actual text.
> * @param s the actual text, without any (non-inline) tags
> * @exception SourceException if the modification cannot be performed
> */
> public void setText(String s) throws SourceException {
> throw new SourceException();
> }
>
> /** Clears the javadoc from the source.
> */
> public void clearJavaDoc() throws SourceException {
> throw new SourceException();
> }
>
> /** Test if this javadoc is empty.
> * @return true if it is not generated to the source.
> */
> public boolean isEmpty() {
> return true;
> }
>
> /** Gets all tags from comment.
> */
> public JavaDocTag[] getTags() {
> return TAGS_EMPTY;
> }
>
> /** Gets all tags of given name
> */
> public JavaDocTag[] getTags(String name) {
> return TAGS_EMPTY;
> }
>
> /** Adds removes or sets tags used in this comment
> * @param elems the new initializers
> * @param action {@link #ADD}, {@link #REMOVE}, or {@link #SET}
> * @exception SourceException if impossible
> */
> public void changeTags(JavaDocTag[] tags,int action) throws SourceException {
> throw new SourceException();
> }
>
> /** Gets all @see tags
> */
> public JavaDocTag.See[] getSeeTags() {
> return SEE_TAGS_EMPTY;
> }
>
> /** The JavaDoc of a class.
> * Class javadoc adds no special tags.
117,126c108,112
< public JavaDocTag.SerialField[] getSerialFieldTags() {
< return SERIALFIELD_TAGS_EMPTY;
< };
< }
<
< /** The JavaDoc of a method. Adds two special tags: @para tag and @throws tag.
< */
< static class Method extends ClassJavaDocImpl implements JavaDoc.Method {
<
< /** Gets param tags.
---
> static class Class extends ClassJavaDocImpl implements JavaDoc.Class {
> }
>
> /** The JavaDoc of a field.
> *
Currently adds special @SerialField tag
128,130c114,120
< public JavaDocTag.Param[] getParamTags() {
< return PARAM_TAGS_EMPTY;
< };
---
> static class Field extends ClassJavaDocImpl implements JavaDoc.Field {
> /** Gets SerialField tags.
> */
> public JavaDocTag.SerialField[] getSerialFieldTags() {
> return SERIALFIELD_TAGS_EMPTY;
> };
> }
132c122
< /** Gets throws tags.
---
> /** The JavaDoc of a method. Adds two special tags: @para tag and @throws tag.
134,137c124,137
< public JavaDocTag.Throws[] getThrowsTags() {
< return THROWS_TAGS_EMPTY;
< };
< }
---
> static class Method extends ClassJavaDocImpl implements JavaDoc.Method {
>
> /** Gets param tags.
> */
> public JavaDocTag.Param[] getParamTags() {
> return PARAM_TAGS_EMPTY;
> };
>
> /** Gets throws tags.
> */
> public JavaDocTag.Throws[] getThrowsTags() {
> return THROWS_TAGS_EMPTY;
> };
> }
Index: ClassModule.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/ClassModule.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
28c28
< public class ClassModule implements ModuleInstall, ClassElement.Finder {
---
> public class ClassModule extends ModuleInstall implements ClassElement.Finder {
37,41d36
< /** Module installed for the first time. */
< public void installed() {
< restored ();
< }
<
52,55d46
< /** Module is being closed. */
< public boolean closing () {
< return true; // agree to close
< }
59a51,52
> * 5 Gandalf 1.4 10/1/99 Petr Hrebejk org.openide.modules.ModuleInstall
> * changed to class + some methods added
Index: CompiledDataObject.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/CompiledDataObject.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
23a24
> import java.util.Enumeration;
37a39
> import org.openide.execution.Executor;
264a267,290
>
> private static class ExecSupport extends org.openide.loaders.ExecSupport {
> ExecSupport(MultiDataObject.Entry en) {
> super(en);
> }
>
> /**
> * Iterates through Execution service type, looking for some exec
> * service from the java module.
> */
> protected Executor defaultExecutor() {
> Enumeration servs = org.openide.TopManager.getDefault().getServices().
> services(Executor.class);
> while (servs.hasMoreElements()) {
> Object o = servs.nextElement();
> if (o.getClass().getName().startsWith(
> "org.netbeans.modules.java.JavaProcessExecutor"
> )) {
> return (Executor)o;
> }
> }
> return super.defaultExecutor();
> }
> }
Index: ConstructorElementImpl.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/ConstructorElementImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
35c35
< private Type[] exceptions;
---
> private Identifier[] exceptions;
79c79
< public Type[] getExceptions () {
---
> public Identifier[] getExceptions () {
87c87
< exceptions = new Type[reflEx.length];
---
> exceptions = new Identifier[reflEx.length];
90c90
< exceptions[i] = Type.createFromClass(reflEx[i]);
---
> exceptions[i] = Identifier.create(reflEx[i].getName());
98c98
< public void setExceptions (Type[] exceptions) throws SourceException {
---
> public void setExceptions (Identifier[] exceptions) throws SourceException {
127a128
> * 5 src-jtulach1.4 3/15/99 Petr Hamernik
Index: ElementImpl.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/ElementImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
22,23c22,23
< import com.netbeans.ide.nodes.Node;
< import com.netbeans.ide.src.Element;
---
> import org.openide.nodes.Node;
> import org.openide.src.Element;
66a67,68
> * 5 src-jtulach1.4 6/9/99 Ian Formanek ---- Package Change To
> * org.openide ----
Index: FieldElementImpl.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/FieldElementImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
31a32
> static final long serialVersionUID =-4800326520399939102L;
79a81,82
> * 5 src-jtulach1.4 8/9/99 Ian Formanek Generated Serial Version
> * UID
Index: MemberElementImpl.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/MemberElementImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
68,73c68,72
< if (data instanceof Class)
< // Class doesn't implement Member interface...
< name = Identifier.create(
< Utilities.getShortClassName((Class)data));
< else
< name = Identifier.create(((Member)data).getName());
---
> String s = (data instanceof Class) ?
> Utilities.getClassName((Class)data) :
> ((Member)data).getName();
>
> name = Identifier.create(s);
94a94,95
> * 5 src-jtulach1.4 5/12/99 Petr Hamernik ide.src.Identifier
> * updated
Index: MethodElementImpl.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/MethodElementImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
58a59,60
> * 5 src-jtulach1.4 10/23/99 Ian Formanek NO SEMANTIC CHANGE - Sun
> * Microsystems Copyright in File Comment
Index: SerDataNode.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/SerDataNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
35c35
< "com/netbeans/developer/modules/resources/class/ser";
---
> "/com/netbeans/developer/modules/loaders/class/resources/ser";
37c37
< "com/netbeans/developer/modules/resources/class/serMain";
---
> "/com/netbeans/developer/modules/loaders/class/resources/serMain";
39c39
< "com/netbeans/developer/modules/resources/class/serError";
---
> "/com/netbeans/developer/modules/loaders/class/resources/serError";
78a79,80
> * 5 src-jtulach1.4 3/22/99 Ian Formanek Icons moved from
> * modules/resources to this package
Index: SerDataObject.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/SerDataObject.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
17a18
> import org.openide.loaders.InstanceSupport;
19a21
> import org.openide.util.HelpCtx;
55a58,65
> public HelpCtx getHelpCtx () {
> HelpCtx test = InstanceSupport.findHelp (instanceSupport);
> if (test != null)
> return test;
> else
> return new HelpCtx (SerDataObject.class);
> }
>
59a70
> * 5 src-jtulach1.4 6/25/99 Jesse Glick Instance context help.
Index: SourceElementImpl.java
===================================================================
RCS file: /cvs/clazz/src/org/netbeans/modules/clazz/SourceElementImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
28c28
< * @author Dafe Simonek
---
> * @author Dafe Simonek, Jan Jancura
39,43d38
< /** Soft reference to the map of class elements of
< * all classes and interfaces declared in the hierarchy tree under
< * the class which we are representing */
< private SoftReference classesMap;
<
100,106c95
< Map allClassesMap = (Map)allClasses.get();
< if (allClassesMap == null) {
< // soft ref null, we must recreate
< allClassesMap = createClassesMap();
< allClasses = new SoftReference(allClassesMap);
< }
< return (ClassElement)allClassesMap.get(name);
---
> return (ClassElement)getAllClassesMap ().get(name);
113,119c102
< Map allClassesMap = (Map)allClasses.get();
< if (allClassesMap == null) {
< // soft ref null, we must recreate
< allClassesMap = createClassesMap();
< allClasses = new SoftReference(allClassesMap);
< }
< return (ClassElement[])allClassesMap.values().toArray();
---
> return (ClassElement[])getAllClassesMap ().values().toArray (new ClassElement[0]);
149a133,146
> /** Returns map with all innerclasses.
> * @return map with all innerclasses.
> */
> private Map getAllClassesMap () {
> Map allClassesMap = (allClasses == null) ? null : (Map)allClasses.get();
> if (allClassesMap == null) {
> // soft ref null, we must recreate
> allClassesMap = createClassesMap();
> // remember it, please ...
> allClasses = new SoftReference(allClassesMap);
> }
> return allClassesMap;
> }
>
186a184
> * 5 src-jtulach1.4 4/1/99 Jan Jancura Object browser support