From 6a626ec493f036f9da80d71a6544ab9faaae7071 Mon Sep 17 00:00:00 2001 From: konsoletyper Date: Sun, 2 Feb 2014 20:35:12 +0400 Subject: [PATCH] Renamings --- .../src/main/java/org/teavm/model/CopyClassHolderSource.java | 2 +- .../teavm/{model/resource => parsing}/ClassRefsRenamer.java | 2 +- .../resource => parsing}/ClasspathClassHolderSource.java | 5 ++++- .../{model/resource => parsing}/ClasspathResourceMapper.java | 2 +- .../teavm/{model => }/resource/ClasspathResourceReader.java | 2 +- .../teavm/{model => }/resource/MapperClassHolderSource.java | 2 +- .../{model => }/resource/ResourceClassHolderMapper.java | 2 +- .../java/org/teavm/{model => }/resource/ResourceParser.java | 2 +- .../java/org/teavm/{model => }/resource/ResourceReader.java | 2 +- .../main/java/org/teavm/maven/BuildJavascriptJUnitMojo.java | 2 +- .../src/main/java/org/teavm/maven/BuildJavascriptMojo.java | 2 +- 11 files changed, 14 insertions(+), 11 deletions(-) rename teavm-core/src/main/java/org/teavm/{model/resource => parsing}/ClassRefsRenamer.java (99%) rename teavm-core/src/main/java/org/teavm/{model/resource => parsing}/ClasspathClassHolderSource.java (89%) rename teavm-core/src/main/java/org/teavm/{model/resource => parsing}/ClasspathResourceMapper.java (99%) rename teavm-core/src/main/java/org/teavm/{model => }/resource/ClasspathResourceReader.java (97%) rename teavm-core/src/main/java/org/teavm/{model => }/resource/MapperClassHolderSource.java (97%) rename teavm-core/src/main/java/org/teavm/{model => }/resource/ResourceClassHolderMapper.java (98%) rename teavm-core/src/main/java/org/teavm/{model => }/resource/ResourceParser.java (97%) rename teavm-core/src/main/java/org/teavm/{model => }/resource/ResourceReader.java (96%) diff --git a/teavm-core/src/main/java/org/teavm/model/CopyClassHolderSource.java b/teavm-core/src/main/java/org/teavm/model/CopyClassHolderSource.java index 9e90744c2..7e17f1ecb 100644 --- a/teavm-core/src/main/java/org/teavm/model/CopyClassHolderSource.java +++ b/teavm-core/src/main/java/org/teavm/model/CopyClassHolderSource.java @@ -19,8 +19,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import org.teavm.common.Mapper; -import org.teavm.model.resource.MapperClassHolderSource; import org.teavm.model.util.ProgramUtils; +import org.teavm.resource.MapperClassHolderSource; /** * diff --git a/teavm-core/src/main/java/org/teavm/model/resource/ClassRefsRenamer.java b/teavm-core/src/main/java/org/teavm/parsing/ClassRefsRenamer.java similarity index 99% rename from teavm-core/src/main/java/org/teavm/model/resource/ClassRefsRenamer.java rename to teavm-core/src/main/java/org/teavm/parsing/ClassRefsRenamer.java index 91edf4fcf..22074161c 100644 --- a/teavm-core/src/main/java/org/teavm/model/resource/ClassRefsRenamer.java +++ b/teavm-core/src/main/java/org/teavm/parsing/ClassRefsRenamer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.teavm.model.resource; +package org.teavm.parsing; import java.util.Map; import org.teavm.common.Mapper; diff --git a/teavm-core/src/main/java/org/teavm/model/resource/ClasspathClassHolderSource.java b/teavm-core/src/main/java/org/teavm/parsing/ClasspathClassHolderSource.java similarity index 89% rename from teavm-core/src/main/java/org/teavm/model/resource/ClasspathClassHolderSource.java rename to teavm-core/src/main/java/org/teavm/parsing/ClasspathClassHolderSource.java index 06dd1e52b..c06ec6acd 100644 --- a/teavm-core/src/main/java/org/teavm/model/resource/ClasspathClassHolderSource.java +++ b/teavm-core/src/main/java/org/teavm/parsing/ClasspathClassHolderSource.java @@ -13,10 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.teavm.model.resource; +package org.teavm.parsing; import org.teavm.model.ClassHolder; import org.teavm.model.ClassHolderSource; +import org.teavm.resource.ClasspathResourceReader; +import org.teavm.resource.MapperClassHolderSource; +import org.teavm.resource.ResourceClassHolderMapper; /** * diff --git a/teavm-core/src/main/java/org/teavm/model/resource/ClasspathResourceMapper.java b/teavm-core/src/main/java/org/teavm/parsing/ClasspathResourceMapper.java similarity index 99% rename from teavm-core/src/main/java/org/teavm/model/resource/ClasspathResourceMapper.java rename to teavm-core/src/main/java/org/teavm/parsing/ClasspathResourceMapper.java index 2a6a56ba7..8cac260bf 100644 --- a/teavm-core/src/main/java/org/teavm/model/resource/ClasspathResourceMapper.java +++ b/teavm-core/src/main/java/org/teavm/parsing/ClasspathResourceMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.teavm.model.resource; +package org.teavm.parsing; import java.io.IOException; import java.io.InputStream; diff --git a/teavm-core/src/main/java/org/teavm/model/resource/ClasspathResourceReader.java b/teavm-core/src/main/java/org/teavm/resource/ClasspathResourceReader.java similarity index 97% rename from teavm-core/src/main/java/org/teavm/model/resource/ClasspathResourceReader.java rename to teavm-core/src/main/java/org/teavm/resource/ClasspathResourceReader.java index d2633e5c1..cdfe762eb 100644 --- a/teavm-core/src/main/java/org/teavm/model/resource/ClasspathResourceReader.java +++ b/teavm-core/src/main/java/org/teavm/resource/ClasspathResourceReader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.teavm.model.resource; +package org.teavm.resource; import java.io.IOException; import java.io.InputStream; diff --git a/teavm-core/src/main/java/org/teavm/model/resource/MapperClassHolderSource.java b/teavm-core/src/main/java/org/teavm/resource/MapperClassHolderSource.java similarity index 97% rename from teavm-core/src/main/java/org/teavm/model/resource/MapperClassHolderSource.java rename to teavm-core/src/main/java/org/teavm/resource/MapperClassHolderSource.java index 2e1228164..0cc1856e2 100644 --- a/teavm-core/src/main/java/org/teavm/model/resource/MapperClassHolderSource.java +++ b/teavm-core/src/main/java/org/teavm/resource/MapperClassHolderSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.teavm.model.resource; +package org.teavm.resource; import org.teavm.common.ConcurrentCachedMapper; import org.teavm.common.Mapper; diff --git a/teavm-core/src/main/java/org/teavm/model/resource/ResourceClassHolderMapper.java b/teavm-core/src/main/java/org/teavm/resource/ResourceClassHolderMapper.java similarity index 98% rename from teavm-core/src/main/java/org/teavm/model/resource/ResourceClassHolderMapper.java rename to teavm-core/src/main/java/org/teavm/resource/ResourceClassHolderMapper.java index b255eaa4d..d9dbcd9d0 100644 --- a/teavm-core/src/main/java/org/teavm/model/resource/ResourceClassHolderMapper.java +++ b/teavm-core/src/main/java/org/teavm/resource/ResourceClassHolderMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.teavm.model.resource; +package org.teavm.resource; import java.io.IOException; import java.io.InputStream; diff --git a/teavm-core/src/main/java/org/teavm/model/resource/ResourceParser.java b/teavm-core/src/main/java/org/teavm/resource/ResourceParser.java similarity index 97% rename from teavm-core/src/main/java/org/teavm/model/resource/ResourceParser.java rename to teavm-core/src/main/java/org/teavm/resource/ResourceParser.java index 80c53fd5d..e2f5be059 100644 --- a/teavm-core/src/main/java/org/teavm/model/resource/ResourceParser.java +++ b/teavm-core/src/main/java/org/teavm/resource/ResourceParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.teavm.model.resource; +package org.teavm.resource; import java.io.IOException; import java.io.InputStream; diff --git a/teavm-core/src/main/java/org/teavm/model/resource/ResourceReader.java b/teavm-core/src/main/java/org/teavm/resource/ResourceReader.java similarity index 96% rename from teavm-core/src/main/java/org/teavm/model/resource/ResourceReader.java rename to teavm-core/src/main/java/org/teavm/resource/ResourceReader.java index 0ea870138..571dccd35 100644 --- a/teavm-core/src/main/java/org/teavm/model/resource/ResourceReader.java +++ b/teavm-core/src/main/java/org/teavm/resource/ResourceReader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.teavm.model.resource; +package org.teavm.resource; import java.io.IOException; import java.io.InputStream; diff --git a/teavm-maven-plugin/src/main/java/org/teavm/maven/BuildJavascriptJUnitMojo.java b/teavm-maven-plugin/src/main/java/org/teavm/maven/BuildJavascriptJUnitMojo.java index aa5263df3..64e7894aa 100644 --- a/teavm-maven-plugin/src/main/java/org/teavm/maven/BuildJavascriptJUnitMojo.java +++ b/teavm-maven-plugin/src/main/java/org/teavm/maven/BuildJavascriptJUnitMojo.java @@ -40,7 +40,7 @@ import org.teavm.common.ThreadPoolFiniteExecutor; import org.teavm.javascript.JavascriptBuilder; import org.teavm.javascript.JavascriptBuilderFactory; import org.teavm.model.*; -import org.teavm.model.resource.ClasspathClassHolderSource; +import org.teavm.parsing.ClasspathClassHolderSource; /** * diff --git a/teavm-maven-plugin/src/main/java/org/teavm/maven/BuildJavascriptMojo.java b/teavm-maven-plugin/src/main/java/org/teavm/maven/BuildJavascriptMojo.java index ac1f1f377..5c03f0a0a 100644 --- a/teavm-maven-plugin/src/main/java/org/teavm/maven/BuildJavascriptMojo.java +++ b/teavm-maven-plugin/src/main/java/org/teavm/maven/BuildJavascriptMojo.java @@ -36,7 +36,7 @@ import org.teavm.javascript.JavascriptBuilderFactory; import org.teavm.model.MethodDescriptor; import org.teavm.model.MethodReference; import org.teavm.model.ValueType; -import org.teavm.model.resource.ClasspathClassHolderSource; +import org.teavm.parsing.ClasspathClassHolderSource; /** *