Revert copy factory method to copy constructor.

regisd · regisd · commit 7289a45ff389 · 2018-10-06T15:36:03.000+02:00
diff --git a/jflex/src/main/java/jflex/IntCharSet.java b/jflex/src/main/java/jflex/IntCharSet.java
@@ -117,7 +117,7 @@ public void add(Interval interval) {
       if (elem.contains(interval)) return;
 
       if (elem.start > interval.end + 1) {
-        intervals.add(i, Interval.copyOf(interval));
+        intervals.add(i, new Interval(interval));
         return;
       }
 
@@ -142,7 +142,7 @@ public void add(Interval interval) {
       return;
     }
 
-    intervals.add(Interval.copyOf(interval));
+    intervals.add(new Interval(interval));
   }
 
   /**
diff --git a/jflex/src/main/java/jflex/Interval.java b/jflex/src/main/java/jflex/Interval.java
@@ -34,8 +34,9 @@ public Interval(int start, int end) {
     this.end = end;
   }
 
-  public static Interval copyOf(Interval other) {
-    return new Interval(other.start, other.end);
+  public Interval(Interval other) {
+    this.start = other.start;
+    this.end = other.end;
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public void add(Interval interval) {`
`117`	`117`	`if (elem.contains(interval)) return;`
`118`	`118`
`119`	`119`	`if (elem.start > interval.end + 1) {`
`120`		`- intervals.add(i, Interval.copyOf(interval));`
	`120`	`+ intervals.add(i, new Interval(interval));`
`121`	`121`	`return;`
`122`	`122`	`}`
`123`	`123`
`@@ -142,7 +142,7 @@ public void add(Interval interval) {`
`142`	`142`	`return;`
`143`	`143`	`}`
`144`	`144`
`145`		`- intervals.add(Interval.copyOf(interval));`
	`145`	`+ intervals.add(new Interval(interval));`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,9 @@ public Interval(int start, int end) {`
`34`	`34`	`this.end = end;`
`35`	`35`	`}`
`36`	`36`
`37`		`- public static Interval copyOf(Interval other) {`
`38`		`- return new Interval(other.start, other.end);`
	`37`	`+ public Interval(Interval other) {`
	`38`	`+ this.start = other.start;`
	`39`	`+ this.end = other.end;`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`/**`