You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by lu...@apache.org on 2004/06/28 12:14:39 UTC

cvs commit: jakarta-slide/src/share/org/apache/slide/structure ObjectNode.java

luetzkendorf    2004/06/28 03:14:39

  Modified:    src/share/org/apache/slide/structure ObjectNode.java
  Log:
  refactoring of visibilities
  added a FIXME
  
  Revision  Changes    Path
  1.25      +20 -22    jakarta-slide/src/share/org/apache/slide/structure/ObjectNode.java
  
  Index: ObjectNode.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/ObjectNode.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- ObjectNode.java	11 Feb 2004 11:30:19 -0000	1.24
  +++ ObjectNode.java	28 Jun 2004 10:14:39 -0000	1.25
  @@ -62,11 +62,13 @@
        */
       private Vector links;
       
  -    /**
  +    /*
        * If true then the {@link #links} vector is shared between multiple
        * ObjectNode-instances and thus must not be modified.
  +     * 
  +     *FIXME Never read! Do we need to implement linkSharing
        */
  -    private boolean linksShared;
  +    //private boolean linksShared;
       
       /**
        * Vector of bindings. Before modifying this vector you must check
  @@ -370,7 +372,7 @@
           
           try {
               // init the shared fields to let clone() copy them
  -            this.linksShared=true;
  +            //this.linksShared=true;
               this.bindingsShared=true;
               result = (ObjectNode) super.clone();
           } catch(CloneNotSupportedException e) {
  @@ -391,7 +393,7 @@
           
           try {
               result = (ObjectNode) super.clone();
  -            result.linksShared=false;
  +            //result.linksShared=false;
               result.bindingsShared=false;
               result.links = new Vector();
               result.bindings = new BindingList();
  @@ -598,8 +600,8 @@
        */
       public static class Binding implements Serializable, Cloneable {
           
  -        final String bName;
  -        final String bUuri;
  +        protected final String bName;
  +        protected final String bUuri;
           
           public Binding(String bindingName, String bindingUuri) {
               this.bName = bindingName;
  @@ -655,7 +657,7 @@
       
       public static class ParentBindingList extends BindingList {
           
  -        private ParentBindingList() {
  +        public ParentBindingList() {
               super();
           }
           
  @@ -663,11 +665,11 @@
               super(container);
           }
           
  -        private Enumeration elements() {
  +        protected Enumeration elements() {
               return container.elements();
           }
           
  -        private ParentBinding put(String bindingName, ObjectNode source) {
  +        protected Binding put(String bindingName, ObjectNode source) {
               String uuri = "";
               if (source != null && source.getUuri() != null) {
                   uuri = source.getUuri();
  @@ -684,7 +686,7 @@
               return result;
           }
           
  -        private void remove(String bindingName, String uuri) {
  +        protected void remove(String bindingName, String uuri) {
               container.removeElement( new ParentBinding(bindingName, uuri) );
           }
           
  @@ -695,17 +697,13 @@
           public String toString() {
               return String.valueOf(container);
           }
  -        
  -        public int size() {
  -            return container.size();
  -        }
       }
       
       public static class BindingList implements Serializable, Cloneable {
           
           protected Vector container;
           
  -        private BindingList() {
  +        public BindingList() {
               this.container = new Vector();
           }
           
  @@ -713,7 +711,7 @@
               this.container = container;
           }
           
  -        private Enumeration elements() {
  +        protected Enumeration elements() {
               return container.elements();
           }
           
  @@ -726,7 +724,7 @@
               return b;
           }
           
  -        private Binding put(String bindingName, ObjectNode source) {
  +        protected Binding put(String bindingName, ObjectNode source) {
               Binding result = null;
               String uuri = "";
               if (source != null && source.getUuri() != null) {
  @@ -743,7 +741,7 @@
               return result;
           }
           
  -        private void remove(String bindingName) {
  +        protected void remove(String bindingName) {
               container.removeElement( new Binding(bindingName, null) );
           }
           
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org