Skip to content

Commit 9a4f0e2

Browse files
BobHansonBobHanson
committed
removing TripWire references
1 parent e788fc6 commit 9a4f0e2

File tree

15 files changed

+89
-85
lines changed

15 files changed

+89
-85
lines changed

‎sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar‎

342 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200104112434
1+
20200105111457

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.6/net.sf.j2s.core.jar‎

342 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.6/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200104112434
1+
20200105111457

‎sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import java.text.SimpleDateFormat;
1414
import java.util.ArrayList;
15+
import java.util.Arrays;
1516
//import java.util.Arrays;
1617
import java.util.Date;
1718
import java.util.HashMap;
@@ -5133,9 +5134,11 @@ private boolean checkGenericClass(ITypeBinding topBinding, ITypeBinding binding)
51335134
hasGenerics = checkGenericClass(topBinding, interfaces[i]) || hasGenerics;
51345135
}
51355136
if (hasGenerics) {
5137+
bufferDebug("\n>checkGeneric true " + topBinding.getKey() + " for " + classKey);
51365138
addSyntheticMethods(topBinding.getKey(), binding);
51375139
} else {
5138-
syntheticClassMethodNameMap.put(classKey, null);
5140+
bufferDebug("\n>checkGeneric false removing " + topBinding.getKey() + " for "+ classKey);
5141+
syntheticClassMethodNameMap.remove(classKey);
51395142
}
51405143
return hasGenerics;
51415144
}
@@ -5149,7 +5152,7 @@ private boolean checkGenericClass(ITypeBinding topBinding, ITypeBinding binding)
51495152
*/
51505153
private void addSyntheticMethods(String topClassKey, ITypeBinding binding) {
51515154
Map<String, String> classTypes = getGenericClassTypes(binding);
5152-
//buffer Debug(">addSynthMethods " + topClassKey + " " + classTypes);
5155+
bufferDebug("\n>addSynthMethods" + topClassKey + " " + classTypes);
51535156
if (classTypes == null)
51545157
return;
51555158
String classKey = binding.getKey();
@@ -5191,6 +5194,7 @@ private void addSyntheticMethod(String classKey, String methodName, String[] lis
51915194
if (methodList == null)
51925195
classMap.put(methodName, methodList = new ArrayList<String[]>());
51935196
methodList.add(list);
5197+
bufferDebug("\n>>addsynmeth" + classKey + " " + methodName + " " + Arrays.toString(list));
51945198
}
51955199

51965200
private static ASTNode getAbstractOrAnonymousParentForNode(ASTNode node) {

‎sources/net.sf.j2s.java.core/src/java/util/PrimitiveIterator.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ default void forEachRemaining(IntConsumer action) {
123123
*/
124124
@Override
125125
default Integer next() {
126-
if (Tripwire.ENABLED)
127-
Tripwire.trip(getClass(), "{0} calling PrimitiveIterator.OfInt.nextInt()");
126+
// if (Tripwire.ENABLED)
127+
// Tripwire.trip(getClass(), "{0} calling PrimitiveIterator.OfInt.nextInt()");
128128
return nextInt();
129129
}
130130

@@ -145,8 +145,8 @@ default void forEachRemaining(Consumer<? super Integer> action) {
145145
else {
146146
// The method reference action::accept is never null
147147
Objects.requireNonNull(action);
148-
if (Tripwire.ENABLED)
149-
Tripwire.trip(getClass(), "{0} calling PrimitiveIterator.OfInt.forEachRemainingInt(action::accept)");
148+
// if (Tripwire.ENABLED)
149+
// Tripwire.trip(getClass(), "{0} calling PrimitiveIterator.OfInt.forEachRemainingInt(action::accept)");
150150
forEachRemaining((IntConsumer) action::accept);
151151
}
152152
}
@@ -197,8 +197,8 @@ default void forEachRemaining(LongConsumer action) {
197197
*/
198198
@Override
199199
default Long next() {
200-
if (Tripwire.ENABLED)
201-
Tripwire.trip(getClass(), "{0} calling PrimitiveIterator.OfLong.nextLong()");
200+
// if (Tripwire.ENABLED)
201+
// Tripwire.trip(getClass(), "{0} calling PrimitiveIterator.OfLong.nextLong()");
202202
return nextLong();
203203
}
204204

@@ -219,8 +219,8 @@ default void forEachRemaining(Consumer<? super Long> action) {
219219
else {
220220
// The method reference action::accept is never null
221221
Objects.requireNonNull(action);
222-
if (Tripwire.ENABLED)
223-
Tripwire.trip(getClass(), "{0} calling PrimitiveIterator.OfLong.forEachRemainingLong(action::accept)");
222+
// if (Tripwire.ENABLED)
223+
// Tripwire.trip(getClass(), "{0} calling PrimitiveIterator.OfLong.forEachRemainingLong(action::accept)");
224224
forEachRemaining((LongConsumer) action::accept);
225225
}
226226
}
@@ -270,8 +270,8 @@ default void forEachRemaining(DoubleConsumer action) {
270270
*/
271271
@Override
272272
default Double next() {
273-
if (Tripwire.ENABLED)
274-
Tripwire.trip(getClass(), "{0} calling PrimitiveIterator.OfDouble.nextLong()");
273+
// if (Tripwire.ENABLED)
274+
// Tripwire.trip(getClass(), "{0} calling PrimitiveIterator.OfDouble.nextLong()");
275275
return nextDouble();
276276
}
277277

@@ -293,8 +293,8 @@ default void forEachRemaining(Consumer<? super Double> action) {
293293
else {
294294
// The method reference action::accept is never null
295295
Objects.requireNonNull(action);
296-
if (Tripwire.ENABLED)
297-
Tripwire.trip(getClass(), "{0} calling PrimitiveIterator.OfDouble.forEachRemainingDouble(action::accept)");
296+
// if (Tripwire.ENABLED)
297+
// Tripwire.trip(getClass(), "{0} calling PrimitiveIterator.OfDouble.forEachRemainingDouble(action::accept)");
298298
forEachRemaining((DoubleConsumer) action::accept);
299299
}
300300
}

‎sources/net.sf.j2s.java.core/src/java/util/Spliterator.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ public interface OfInt extends OfPrimitive<Integer, IntConsumer, OfInt> {
651651

652652
@Override
653653
default void forEachRemaining(IntConsumer action) {
654-
do { } while (tryAdvance(action));
654+
do { } while (tryAdvance(action));
655655
}
656656

657657
/**
@@ -670,9 +670,9 @@ default boolean tryAdvance(Consumer<? super Integer> action) {
670670
return tryAdvance((IntConsumer) action);
671671
}
672672
else {
673-
if (Tripwire.ENABLED)
674-
Tripwire.trip(getClass(),
675-
"{0} calling Spliterator.OfInt.tryAdvance((IntConsumer) action::accept)");
673+
// if (Tripwire.ENABLED)
674+
// Tripwire.trip(getClass(),
675+
// "{0} calling Spliterator.OfInt.tryAdvance((IntConsumer) action::accept)");
676676
return tryAdvance((IntConsumer) action::accept);
677677
}
678678
}
@@ -693,9 +693,9 @@ default void forEachRemaining(Consumer<? super Integer> action) {
693693
forEachRemaining((IntConsumer) action);
694694
}
695695
else {
696-
if (Tripwire.ENABLED)
697-
Tripwire.trip(getClass(),
698-
"{0} calling Spliterator.OfInt.forEachRemaining((IntConsumer) action::accept)");
696+
// if (Tripwire.ENABLED)
697+
// Tripwire.trip(getClass(),
698+
// "{0} calling Spliterator.OfInt.forEachRemaining((IntConsumer) action::accept)");
699699
forEachRemaining((IntConsumer) action::accept);
700700
}
701701
}
@@ -734,9 +734,9 @@ default boolean tryAdvance(Consumer<? super Long> action) {
734734
return tryAdvance((LongConsumer) action);
735735
}
736736
else {
737-
if (Tripwire.ENABLED)
738-
Tripwire.trip(getClass(),
739-
"{0} calling Spliterator.OfLong.tryAdvance((LongConsumer) action::accept)");
737+
// if (Tripwire.ENABLED)
738+
// Tripwire.trip(getClass(),
739+
// "{0} calling Spliterator.OfLong.tryAdvance((LongConsumer) action::accept)");
740740
return tryAdvance((LongConsumer) action::accept);
741741
}
742742
}
@@ -757,9 +757,9 @@ default void forEachRemaining(Consumer<? super Long> action) {
757757
forEachRemaining((LongConsumer) action);
758758
}
759759
else {
760-
if (Tripwire.ENABLED)
761-
Tripwire.trip(getClass(),
762-
"{0} calling Spliterator.OfLong.forEachRemaining((LongConsumer) action::accept)");
760+
// if (Tripwire.ENABLED)
761+
// Tripwire.trip(getClass(),
762+
// "{0} calling Spliterator.OfLong.forEachRemaining((LongConsumer) action::accept)");
763763
forEachRemaining((LongConsumer) action::accept);
764764
}
765765
}
@@ -798,9 +798,9 @@ default boolean tryAdvance(Consumer<? super Double> action) {
798798
return tryAdvance((DoubleConsumer) action);
799799
}
800800
else {
801-
if (Tripwire.ENABLED)
802-
Tripwire.trip(getClass(),
803-
"{0} calling Spliterator.OfDouble.tryAdvance((DoubleConsumer) action::accept)");
801+
// if (Tripwire.ENABLED)
802+
// Tripwire.trip(getClass(),
803+
// "{0} calling Spliterator.OfDouble.tryAdvance((DoubleConsumer) action::accept)");
804804
return tryAdvance((DoubleConsumer) action::accept);
805805
}
806806
}
@@ -822,9 +822,9 @@ default void forEachRemaining(Consumer<? super Double> action) {
822822
forEachRemaining((DoubleConsumer) action);
823823
}
824824
else {
825-
if (Tripwire.ENABLED)
826-
Tripwire.trip(getClass(),
827-
"{0} calling Spliterator.OfDouble.forEachRemaining((DoubleConsumer) action::accept)");
825+
// if (Tripwire.ENABLED)
826+
// Tripwire.trip(getClass(),
827+
// "{0} calling Spliterator.OfDouble.forEachRemaining((DoubleConsumer) action::accept)");
828828
forEachRemaining((DoubleConsumer) action::accept);
829829
}
830830
}

‎sources/net.sf.j2s.java.core/src/java/util/Spliterators.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ private static final class OfRef<T>
867867

868868
private static final class OfInt
869869
extends EmptySpliterator<Integer, Spliterator.OfInt, IntConsumer>
870-
implements Spliterator.OfInt {
870+
implements Spliterator.OfInt {
871871
OfInt() { }
872872

873873
/**

‎sources/net.sf.j2s.java.core/src/java/util/stream/DoublePipeline.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ private static DoubleConsumer adapt(Sink<Double> sink) {
9898
if (sink instanceof DoubleConsumer) {
9999
return (DoubleConsumer) sink;
100100
} else {
101-
if (Tripwire.ENABLED)
102-
Tripwire.trip(AbstractPipeline.class,
103-
"using DoubleStream.adapt(Sink<Double> s)");
101+
// if (Tripwire.ENABLED)
102+
// Tripwire.trip(AbstractPipeline.class,
103+
// "using DoubleStream.adapt(Sink<Double> s)");
104104
return sink::accept;
105105
}
106106
}
@@ -116,9 +116,9 @@ private static Spliterator.OfDouble adapt(Spliterator<Double> s) {
116116
if (s instanceof Spliterator.OfDouble) {
117117
return (Spliterator.OfDouble) s;
118118
} else {
119-
if (Tripwire.ENABLED)
120-
Tripwire.trip(AbstractPipeline.class,
121-
"using DoubleStream.adapt(Spliterator<Double> s)");
119+
// if (Tripwire.ENABLED)
120+
// Tripwire.trip(AbstractPipeline.class,
121+
// "using DoubleStream.adapt(Spliterator<Double> s)");
122122
throw new UnsupportedOperationException("DoubleStream.adapt(Spliterator<Double> s)");
123123
}
124124
}

‎sources/net.sf.j2s.java.core/src/java/util/stream/IntPipeline.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ private static IntConsumer adapt(Sink<Integer> sink) {
100100
return (IntConsumer) sink;
101101
}
102102
else {
103-
if (Tripwire.ENABLED)
104-
Tripwire.trip(AbstractPipeline.class,
105-
"using IntStream.adapt(Sink<Integer> s)");
103+
// if (Tripwire.ENABLED)
104+
// Tripwire.trip(AbstractPipeline.class,
105+
// "using IntStream.adapt(Sink<Integer> s)");
106106
return sink::accept;
107107
}
108108
}
@@ -119,9 +119,9 @@ private static Spliterator.OfInt adapt(Spliterator<Integer> s) {
119119
return (Spliterator.OfInt) s;
120120
}
121121
else {
122-
if (Tripwire.ENABLED)
123-
Tripwire.trip(AbstractPipeline.class,
124-
"using IntStream.adapt(Spliterator<Integer> s)");
122+
// if (Tripwire.ENABLED)
123+
// Tripwire.trip(AbstractPipeline.class,
124+
// "using IntStream.adapt(Spliterator<Integer> s)");
125125
throw new UnsupportedOperationException("IntStream.adapt(Spliterator<Integer> s)");
126126
}
127127
}

0 commit comments

Comments
 (0)