Skip to content

Commit 4696acf

Browse files
steveonjavasteveonjava
committed
com.sun -> org.visage rename part 2 - now it compiles!
1 parent d620913 commit 4696acf

File tree

816 files changed

+2427
-2427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

816 files changed

+2427
-2427
lines changed

‎attic/org/visage/runtime/sequence/CartesianProduct.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
* have any questions.
2222
*/
2323

24-
package com.sun.visage.runtime.sequence;
24+
package org.visage.runtime.sequence;
2525

26-
import com.sun.visage.runtime.TypeInfo;
26+
import org.visage.runtime.TypeInfo;
2727

2828
/**
2929
* Special case for n-dimensional foreach comprehension when there are no where clauses on any list and

‎attic/org/visage/runtime/sequence/CartesianProduct2D.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
* have any questions.
2222
*/
2323

24-
package com.sun.visage.runtime.sequence;
24+
package org.visage.runtime.sequence;
2525

26-
import com.sun.visage.runtime.TypeInfo;
26+
import org.visage.runtime.TypeInfo;
2727

2828
/**
2929
* Special case for two-dimensional foreach comprehension when there are no where clauses on either list and

‎attic/org/visage/runtime/sequence/MapSequence.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
* have any questions.
2222
*/
2323

24-
package com.sun.visage.runtime.sequence;
24+
package org.visage.runtime.sequence;
2525

26-
import com.sun.visage.runtime.TypeInfo;
26+
import org.visage.runtime.TypeInfo;
2727

2828
/**
2929
* Provides a view of an underlying sequence by applying a mapping function to each element of the underlying

‎attic/org/visage/runtime/sequence/SequenceMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* have any questions.
2222
*/
2323

24-
package com.sun.visage.runtime.sequence;
24+
package org.visage.runtime.sequence;
2525

2626
/**
2727
* Represents a mapping function that will be applied to each element of a sequence, used in list comprehensions.

‎build.xml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@
323323
<arg value="tf"/>
324324
<arg value="${dist.jar}"/>
325325
</exec>
326-
<taskdef name="bytecode-verify" classname="com.sun.visage.tools.bytecodeverifier.VerifierTask">
326+
<taskdef name="bytecode-verify" classname="org.visage.tools.bytecodeverifier.VerifierTask">
327327
<classpath>
328328
<pathelement location="${ant.jar}"/>
329329
<pathelement location="${build.buildtools.dir}/"/>
@@ -344,15 +344,15 @@
344344
<jar compress="${jar.compress}" destfile="${dist.visagert.jar}" >
345345
<fileset dir="${build.classes.dir}" >
346346
<include name="**/*.class" />
347-
<include name="com/sun/visage/runtime/resources/version.properties"/>
348-
<exclude name="com/sun/tools/visage/**"/>
349-
<exclude name="com/sun/visage/api/**"/>
350-
<exclude name="com/sun/visage/runtime/main/**"/>
347+
<include name="org/visage/runtime/resources/version.properties"/>
348+
<exclude name="org/visage/tools/**"/>
349+
<exclude name="org/visage/api/**"/>
350+
<exclude name="org/visage/runtime/main/**"/>
351351
</fileset>
352352
</jar>
353353
<zip compress="${jar.compress}" destfile="${dist.visagert-main.jar}" >
354354
<zipfileset dir="${build.classes.dir}" >
355-
<include name="com/sun/visage/runtime/main/Main.class"/>
355+
<include name="org/visage/runtime/main/Main.class"/>
356356
</zipfileset>
357357
</zip>
358358
<!-- make CLASS.LIST file using "jar tf" command -->
@@ -365,10 +365,10 @@
365365
<jar compress="${jar.compress}" destfile="${dist.visagert.jar}" >
366366
<fileset dir="${build.classes.dir}">
367367
<include name="**/*.class" />
368-
<include name="com/sun/visage/runtime/resources/version.properties"/>
368+
<include name="org/visage/runtime/resources/version.properties"/>
369369
<include name="**/CLASS.LIST" />
370-
<exclude name="com/sun/tools/visage/**"/>
371-
<exclude name="com/sun/visage/api/**"/>
370+
<exclude name="org/visage/tools/**"/>
371+
<exclude name="org/visage/api/**"/>
372372
</fileset>
373373
</jar>
374374
-->
@@ -442,10 +442,10 @@
442442
</target>
443443

444444
<target name="generate-templates" depends="-pre-compile">
445-
<java classname="com.sun.visage.tools.stringtemplate.ExpandXxxTemplate">
445+
<java classname="org.visage.tools.stringtemplate.ExpandXxxTemplate">
446446
<arg value="${build.generated.dir}" />
447-
<arg value="com/sun/visage/runtime/XxxTemplate.stg" />
448-
<arg value="com/sun/visage/runtime/sequence" />
447+
<arg value="org/visage/runtime/XxxTemplate.stg" />
448+
<arg value="org/visage/runtime/sequence" />
449449
<arg line="AbstractSequence Sequences XxxArraySequence" />
450450
<classpath>
451451
<pathelement location="${build.buildtools.dir}"/>
@@ -456,8 +456,8 @@
456456
</target>
457457

458458
<target name="-do-compile" depends="init,generated-java,-pre-compile" if="have.sources">
459-
<pcompile srcdir="${src.classes.dir}/com"
460-
destdir="${build.generated.dir}/com"
459+
<pcompile srcdir="${src.classes.dir}/org/visage"
460+
destdir="${build.generated.dir}/org/visage"
461461
includes="${includes}"/>
462462

463463
<!-- visage platform version -->
@@ -507,7 +507,7 @@
507507
files shipped with the compiler (not related to the JavaFX Runtime
508508
project). -->
509509

510-
<taskdef name="visagec" classname="com.sun.tools.visage.ant.JavaFxAntTask">
510+
<taskdef name="visagec" classname="org.visage.tools.ant.JavaFxAntTask">
511511
<classpath>
512512
<pathelement location="${ant.jar}"/>
513513
<pathelement location="${build.classes.dir}"/>
@@ -524,7 +524,7 @@
524524
compilerclasspath="${build.classes.dir}:${javac.classpath}">
525525
</visagec>
526526

527-
<taskdef name="bytecode-verify" classname="com.sun.visage.tools.bytecodeverifier.VerifierTask">
527+
<taskdef name="bytecode-verify" classname="org.visage.tools.bytecodeverifier.VerifierTask">
528528
<classpath>
529529
<pathelement location="${ant.jar}"/>
530530
<pathelement location="${build.buildtools.dir}/"/>
@@ -620,7 +620,7 @@
620620
</classpath>
621621
</javac>
622622
<taskdef name="pcompile"
623-
classname="com.sun.visage.tools.compileproperties.CompilePropertiesTask"
623+
classname="org.visage.tools.compileproperties.CompilePropertiesTask"
624624
classpath="${build.buildtools.dir}/"/>
625625
</target>
626626

@@ -748,7 +748,7 @@
748748

749749
<target name="staticsizes" depends="jar, staticsizes-clean">
750750
<mkdir dir="${build.staticsizes.dir}"/>
751-
<java classname="com.sun.visage.tools.jaranalyzer.JarAnalyzer">
751+
<java classname="org.visage.tools.jaranalyzer.JarAnalyzer">
752752
<arg value="${dist.visagert.jar}" />
753753
<arg value="${build.staticsizes.dir}" />
754754
<arg value="http://openjfx.java.sun.com/hudson/job/openjfx-compiler/${jfx.build.number}/artifact/build/staticsizes" />
@@ -764,7 +764,7 @@
764764

765765
<target name="ldclassreport" depends="binaries, ldclassreport-clean">
766766
<mkdir dir="${build.ldclassreport.dir}" />
767-
<java classname="com.sun.visage.tools.classreporter.ClassReporter">
767+
<java classname="org.visage.tools.classreporter.ClassReporter">
768768
<arg value="-dist.dir=${dist.dir}" />
769769
<arg value="-build.dir=${build.ldclassreport.dir}" />
770770
<arg value="-reference.url=http://openjfx.java.sun.com/hudson/job/openjfx-compiler/${jfx.build.number}/changes" />

‎buildtools/fxbtrace/btrace_scripts/FxBtraceTracker.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import static com.sun.btrace.BTraceUtils.*;
2626
import java.util.Map;
2727
import java.lang.ref.*;
28-
import com.sun.visage.runtime.FXObject;
28+
import org.visage.runtime.FXObject;
2929

3030
/**
3131
* This BTrace script tries to measure aggregate stat like total
@@ -57,7 +57,7 @@
5757
private static long fxNotifyDependentsCount = 0;
5858

5959
@OnMethod(
60-
clazz="com.sun.visage.runtime.FXBase",
60+
clazz="org.visage.runtime.FXBase",
6161
method="<init>"
6262
)
6363
public static void onNewFXObject(@Self Object obj, boolean dummy) {
@@ -73,7 +73,7 @@ public static void onNewFXObject(@Self Object obj, boolean dummy) {
7373
}
7474

7575
@OnMethod(
76-
clazz="com.sun.visage.runtime.WeakBinderRef",
76+
clazz="org.visage.runtime.WeakBinderRef",
7777
method="<init>"
7878
)
7979
public static void onNewWeakBinderRef(@Self Object obj, FXObject referred) {
@@ -82,7 +82,7 @@ public static void onNewWeakBinderRef(@Self Object obj, FXObject referred) {
8282
}
8383

8484
@OnMethod(
85-
clazz="com.sun.visage.runtime.Dependent",
85+
clazz="org.visage.runtime.Dependent",
8686
method="<init>"
8787
)
8888
public static void onNewDependent(@Self Object obj, FXObject referred) {
@@ -102,23 +102,23 @@ public static void onReferenceClear(@Self Object obj) {
102102
}
103103

104104
@OnMethod(
105-
clazz="com.sun.visage.runtime.FXBase",
105+
clazz="org.visage.runtime.FXBase",
106106
method="addDependent$"
107107
)
108108
public static void onAddDependent(FXObject obj, int varNum, FXObject dep) {
109109
fxDependentCount++;
110110
}
111111

112112
@OnMethod(
113-
clazz="com.sun.visage.runtime.FXBase",
113+
clazz="org.visage.runtime.FXBase",
114114
method="removeDependent$"
115115
)
116116
public static void onRemoveDependent(FXObject obj, int varNum, FXObject dep) {
117117
fxDependentCount--;
118118
}
119119

120120
@OnMethod(
121-
clazz="com.sun.visage.runtime.FXBase",
121+
clazz="org.visage.runtime.FXBase",
122122
method="notifyDependents$"
123123
)
124124
public static void onNotifyDependents(FXObject obj, int varNum) {

‎buildtools/fxbtrace/btrace_scripts/GetterSetterTracer.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
// "get$foo" are called to do (external) var set
3636
@OnMethod(
37-
clazz="+com.sun.visage.runtime.FXObject",
37+
clazz="+org.visage.runtime.FXObject",
3838
method="/get\\$.+/"
3939
)
4040
public static void onGetterEnter(
@@ -46,7 +46,7 @@ public static void onGetterEnter(
4646
}
4747

4848
@OnMethod(
49-
clazz="+com.sun.visage.runtime.FXObject",
49+
clazz="+org.visage.runtime.FXObject",
5050
method="/get\\$.+/",
5151
location=@Location(Kind.RETURN)
5252
)
@@ -60,7 +60,7 @@ public static void onGetterReturn(
6060

6161
// "set$foo" are called to do (external) var set
6262
@OnMethod(
63-
clazz="+com.sun.visage.runtime.FXObject",
63+
clazz="+org.visage.runtime.FXObject",
6464
method="/set\\$.+/"
6565
)
6666
public static void onSetterEnter(
@@ -72,7 +72,7 @@ public static void onSetterEnter(
7272
}
7373

7474
@OnMethod(
75-
clazz="+com.sun.visage.runtime.FXObject",
75+
clazz="+org.visage.runtime.FXObject",
7676
method="/set\\$.+/",
7777
location=@Location(Kind.RETURN)
7878
)
@@ -86,7 +86,7 @@ public static void onSetterReturn(
8686

8787
// "be$foo" are called to do recomputation set (internal set)
8888
@OnMethod(
89-
clazz="+com.sun.visage.runtime.FXObject",
89+
clazz="+org.visage.runtime.FXObject",
9090
method="/be\\$.+/"
9191
)
9292
public static void onBeEnter(
@@ -99,7 +99,7 @@ public static void onBeEnter(
9999

100100
// "be$foo" are called to do recomputation set (internal set)
101101
@OnMethod(
102-
clazz="+com.sun.visage.runtime.FXObject",
102+
clazz="+org.visage.runtime.FXObject",
103103
method="/be\\$.+/",
104104
location=@Location(Kind.RETURN)
105105
)

‎buildtools/fxbtrace/btrace_scripts/InstVarCount.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.io.File;
2828
import java.util.Map;
2929
import java.util.HashMap;
30-
import com.sun.visage.runtime.FXBase;
30+
import org.visage.runtime.FXBase;
3131

3232
/**
3333
* This script prints count$() value of all FXBase subclasses.
@@ -43,7 +43,7 @@
4343
private static File evt = new File(System.getProperty("user.home"), "InstVarCount");
4444

4545
@OnMethod(
46-
clazz="com.sun.visage.runtime.FXBase",
46+
clazz="org.visage.runtime.FXBase",
4747
method="<init>"
4848
)
4949
public static void onNewFXObject(@Self FXBase self, AnyType[] args) {

‎buildtools/fxbtrace/btrace_scripts/InvalidationTracer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
public static long invalidations;
3838

3939
@OnMethod(
40-
clazz="+com.sun.visage.runtime.FXObject",
40+
clazz="+org.visage.runtime.FXObject",
4141
method="/invalidate\\$.+/"
4242
)
4343
public static void onInvalidateEnter(
@@ -50,7 +50,7 @@ public static void onInvalidateEnter(
5050
}
5151

5252
@OnMethod(
53-
clazz="+com.sun.visage.runtime.FXObject",
53+
clazz="+org.visage.runtime.FXObject",
5454
method="/invalidate\\$.+/",
5555
location=@Location(Kind.RETURN)
5656
)

‎buildtools/fxbtrace/btrace_scripts/NotificationHisto.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
private static Map<String, AtomicInteger> histo = newHashMap();
3636

3737
@OnMethod(
38-
clazz="com.sun.visage.runtime.FXBase",
38+
clazz="org.visage.runtime.FXBase",
3939
method="notifyDependents$"
4040
)
4141
public static void onNotifyDependents(@Self Object obj) {

0 commit comments

Comments
 (0)