commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jua...@apache.org
Subject cvs commit: jakarta-commons-sandbox/jrcs/src/java/org/apache/commons/jrcs/rcs BranchNode.java TrunkNode.java
Date Mon, 28 Apr 2003 16:47:04 GMT
juanco      2003/04/28 09:47:04

  Modified:    jrcs     jrcs.jpx
               jrcs/src/java/org/apache/commons/jrcs/rcs BranchNode.java
                        TrunkNode.java
  Log:
  BUG: overriding public methods with protected replacements
  
  Revision  Changes    Path
  1.2       +42 -42    jakarta-commons-sandbox/jrcs/jrcs.jpx
  
  Index: jrcs.jpx
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jrcs/jrcs.jpx,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jrcs.jpx	28 Sep 2002 15:57:47 -0000	1.1
  +++ jrcs.jpx	28 Apr 2003 16:47:03 -0000	1.2
  @@ -1,46 +1,46 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!--JBuilder XML Project-->
   <project>
  -<property category="generalFormatting" name="blockIndent" value="4"/>
  -<property category="javaFormatting" name="arrayInitDataOnNewLine" value="0"/>
  -<property category="javaFormatting" name="catchOnNewLine" value="1"/>
  -<property category="javaFormatting" name="classBraceNextLine" value="1"/>
  -<property category="javaFormatting" name="methodBraceNextLine" value="1"/>
  -<property category="javaFormatting" name="otherBraceNextLine" value="1"/>
  -<property category="javaFormatting" name="packageThreshold" value="4"/>
  -<property category="javaFormatting" name="throwsOnNewLine" value="1"/>
  -<property category="runtime" name="DefaultConfiguration" value="-1"/>
  -<property category="runtime.0" name="ConfigurationName" value="AllTests"/>
  -<property category="runtime.0" name="RunnableType" value="com.borland.jbuilder.runtime.TestRunner"/>
  -<property category="runtime.0" name="test.class" value="org.apache.commons.jrcs.AllTests"/>
  -<property category="runtime.0" name="test.harness" value="com.borland.jbuilder.unittest.JBTestRunner"/>
  -<property category="serverservices" name="disabled.services" value="connector;jdatastore"/>
  -<property category="serverservices" name="single.server.name" value="Tomcat 4.0"/>
  -<property category="sys" name="AuthorLabel" value="@author"/>
  -<property category="sys" name="BackupPath" value="bak"/>
  -<property category="sys" name="CheckStable" value="1"/>
  -<property category="sys" name="Company" value=""/>
  -<property category="sys" name="CompanyLabel" value="Company:"/>
  -<property category="sys" name="Copyright" value="Copyright (c) 2002"/>
  -<property category="sys" name="CopyrightLabel" value="Copyright:"/>
  -<property category="sys" name="DefaultPath" value="src/java"/>
  -<property category="sys" name="Description" value=""/>
  -<property category="sys" name="DescriptionLabel" value="Description:"/>
  -<property category="sys" name="DocPath" value="doc/api"/>
  -<property category="sys" name="ExcludeClassEnabled" value="0"/>
  -<property category="sys" name="IncludeTestPath" value="1"/>
  -<property category="sys" name="InstanceVisibility" value="2"/>
  -<property category="sys" name="JDK" value="JDK 1.4.0_02-b02"/>
  -<property category="sys" name="LastTag" value="0"/>
  -<property category="sys" name="Libraries" value="JUnit;Jakarta ORO Regexp"/>
  -<property category="sys" name="MakeStable" value="0"/>
  -<property category="sys" name="OutPath" value="classes"/>
  -<property category="sys" name="SourcePath" value="src/java;src/test"/>
  -<property category="sys" name="TestPath" value="src/test"/>
  -<property category="sys" name="Title" value=""/>
  -<property category="sys" name="TitleLabel" value="Title:"/>
  -<property category="sys" name="Version" value="1.0"/>
  -<property category="sys" name="VersionLabel" value="@version"/>
  -<property category="sys" name="WorkingDirectory" value="."/>
  -<file path="src/test/org/apache/commons/jrcs/rcs/idchar.testfile"/>
  +  <property category="generalFormatting" name="blockIndent" value="4"/>
  +  <property category="javaFormatting" name="arrayInitDataOnNewLine" value="0"/>
  +  <property category="javaFormatting" name="catchOnNewLine" value="1"/>
  +  <property category="javaFormatting" name="classBraceNextLine" value="1"/>
  +  <property category="javaFormatting" name="methodBraceNextLine" value="1"/>
  +  <property category="javaFormatting" name="otherBraceNextLine" value="1"/>
  +  <property category="javaFormatting" name="packageThreshold" value="4"/>
  +  <property category="javaFormatting" name="throwsOnNewLine" value="1"/>
  +  <property category="runtime" name="DefaultConfiguration" value="-1"/>
  +  <property category="runtime.0" name="ConfigurationName" value="AllTests"/>
  +  <property category="runtime.0" name="RunnableType" value="com.borland.jbuilder.runtime.TestRunner"/>
  +  <property category="runtime.0" name="test.class" value="org.apache.commons.jrcs.AllTests"/>
  +  <property category="runtime.0" name="test.harness" value="com.borland.jbuilder.unittest.JBTestRunner"/>
  +  <property category="serverservices" name="disabled.services" value="connector;jdatastore"/>
  +  <property category="serverservices" name="single.server.name" value="Tomcat 4.0"/>
  +  <property category="sys" name="AuthorLabel" value="@author"/>
  +  <property category="sys" name="BackupPath" value="bak"/>
  +  <property category="sys" name="CheckStable" value="1"/>
  +  <property category="sys" name="Company" value=""/>
  +  <property category="sys" name="CompanyLabel" value="Company:"/>
  +  <property category="sys" name="Copyright" value="Copyright (c) 2002"/>
  +  <property category="sys" name="CopyrightLabel" value="Copyright:"/>
  +  <property category="sys" name="DefaultPath" value="src/java"/>
  +  <property category="sys" name="Description" value=""/>
  +  <property category="sys" name="DescriptionLabel" value="Description:"/>
  +  <property category="sys" name="DocPath" value="doc/api"/>
  +  <property category="sys" name="ExcludeClassEnabled" value="0"/>
  +  <property category="sys" name="IncludeTestPath" value="1"/>
  +  <property category="sys" name="InstanceVisibility" value="2"/>
  +  <property category="sys" name="JDK" value="java version 1.4.1_02-b06"/>
  +  <property category="sys" name="LastTag" value="0"/>
  +  <property category="sys" name="Libraries" value="JUnit;Jakarta ORO"/>
  +  <property category="sys" name="MakeStable" value="0"/>
  +  <property category="sys" name="OutPath" value="classes"/>
  +  <property category="sys" name="SourcePath" value="src/java;src/test"/>
  +  <property category="sys" name="TestPath" value="src/test"/>
  +  <property category="sys" name="Title" value=""/>
  +  <property category="sys" name="TitleLabel" value="Title:"/>
  +  <property category="sys" name="Version" value="1.0"/>
  +  <property category="sys" name="VersionLabel" value="@version"/>
  +  <property category="sys" name="WorkingDirectory" value="."/>
  +  <file path="src/test/org/apache/commons/jrcs/rcs/idchar.testfile"/>
   </project>
  
  
  
  1.2       +6 -6      jakarta-commons-sandbox/jrcs/src/java/org/apache/commons/jrcs/rcs/BranchNode.java
  
  Index: BranchNode.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jrcs/src/java/org/apache/commons/jrcs/rcs/BranchNode.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BranchNode.java	28 May 2002 16:45:51 -0000	1.1
  +++ BranchNode.java	28 Apr 2003 16:47:03 -0000	1.2
  @@ -108,12 +108,12 @@
   
   
       /**
  -     * Set the next node in the RCS logical hierarcy. 
  -     * Update the _parent and _child node accordingly. 
  +     * Set the next node in the RCS logical hierarcy.
  +     * Update the _parent and _child node accordingly.
        * For BranchNodes, the RCS-next is a child, that is,
        * a node with a larger version number.
        */
  -    protected void setRCSNext(Node node)
  +    public void setRCSNext(Node node)
       {
           super.setRCSNext(node);
           if (this.getChild() != null)
  @@ -127,12 +127,12 @@
           }
       }
   
  -    protected Node deltaRevision()
  +    public Node deltaRevision()
       {
           return this;
       }
   
  -    protected Node nextInPathTo(Version vernum, boolean soft)
  +    public Node nextInPathTo(Version vernum, boolean soft)
               throws NodeNotFoundException
       {
           Version branchPoint = vernum.getBase(this.version.size());
  
  
  
  1.2       +6 -6      jakarta-commons-sandbox/jrcs/src/java/org/apache/commons/jrcs/rcs/TrunkNode.java
  
  Index: TrunkNode.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jrcs/src/java/org/apache/commons/jrcs/rcs/TrunkNode.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TrunkNode.java	28 May 2002 16:45:53 -0000	1.1
  +++ TrunkNode.java	28 Apr 2003 16:47:03 -0000	1.2
  @@ -102,11 +102,11 @@
       }
   
       /**
  -     * Set the next node in the RCS logical hierarcy. 
  -     * Update the _parent and _child node accordingly. 
  +     * Set the next node in the RCS logical hierarcy.
  +     * Update the _parent and _child node accordingly.
        * For a TrunkNode, the RCS-next is the immediate parent.
        */
  -    protected void setRCSNext(Node node)
  +    public void setRCSNext(Node node)
       {
           super.setRCSNext(node);
           if (this.getParent() != null)
  @@ -121,12 +121,12 @@
       }
   
   
  -    protected Node deltaRevision()
  +    public Node deltaRevision()
       {
           return (getChild() != null ? getChild() : this);
       }
   
  -    protected Node nextInPathTo(Version vernum, boolean soft)
  +    public Node nextInPathTo(Version vernum, boolean soft)
               throws NodeNotFoundException
       {
           Version branchPoint = vernum.getBase(2);
  
  
  

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


Mime
View raw message