The Versioning Exlorer icon defined, settings_categories_after_merge
authormentlicher@netbeans.org
Wed, 05 Sep 2001 14:28:21 +0000
changeset 158919828f72dcb3
parent 1588 5d660a1c4ceb
child 1590 3a8b2cd19b32
The Versioning Exlorer icon defined,
deserialization fixed.
This is a fix of issue #14624.
vcscore/src/org/netbeans/modules/vcscore/versioning/impl/VersioningExplorer.java
     1.1 --- a/vcscore/src/org/netbeans/modules/vcscore/versioning/impl/VersioningExplorer.java	Wed Sep 05 10:27:59 2001 +0000
     1.2 +++ b/vcscore/src/org/netbeans/modules/vcscore/versioning/impl/VersioningExplorer.java	Wed Sep 05 14:28:21 2001 +0000
     1.3 @@ -45,6 +45,7 @@
     1.4          //panel.setName(org.openide.util.NbBundle.getBundle(RevisionExplorer.class).getString("CTL_Explorer.title"));
     1.5          panel.setName(root.getDisplayName());
     1.6          panel.getExplorerManager().setRootContext(root);
     1.7 +        panel.setIcon (org.openide.util.Utilities.loadImage("/org/netbeans/modules/vcscore/versioning/impl/versioningExplorer.gif"));
     1.8          initComponents();
     1.9      }
    1.10  
    1.11 @@ -121,6 +122,7 @@
    1.12  
    1.13          private transient ArrayList closeListeners = new ArrayList();
    1.14      
    1.15 +        static final long serialVersionUID =-264310566346550916L;
    1.16          Panel() {
    1.17          }
    1.18  
    1.19 @@ -172,14 +174,17 @@
    1.20              //setName(getExplorerManager().getRootContext().getDisplayName());
    1.21          }
    1.22  
    1.23 -        /**
    1.24 -         * Disable serialization.
    1.25 -         * @return null
    1.26 -         *
    1.27 -        protected Object writeReplace () throws java.io.ObjectStreamException {
    1.28 -            closeNotify();
    1.29 -            return null;
    1.30 +        /** Writes a resolvable */
    1.31 +        protected Object writeReplace() {
    1.32 +            return new Resolvable();
    1.33          }
    1.34 -         */
    1.35 +
    1.36 +        static class Resolvable implements java.io.Serializable {
    1.37 +            
    1.38 +            static final long serialVersionUID =2445268234090632539L;
    1.39 +            private Object readResolve() {
    1.40 +                return getRevisionExplorer();
    1.41 +            }
    1.42 +        }
    1.43      }
    1.44  }