You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2014/07/28 10:41:09 UTC
git commit: TAP5-2139: rename JavascriptAggregationStrategy to
JavaScriptAggregationStrategy to match other classes' capitalization
Repository: tapestry-5
Updated Branches:
refs/heads/master 897d27054 -> 74a066eb7
TAP5-2139: rename JavascriptAggregationStrategy to JavaScriptAggregationStrategy to match other classes' capitalization
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/74a066eb
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/74a066eb
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/74a066eb
Branch: refs/heads/master
Commit: 74a066eb762f2f3c1efe211229e64a3322188ea5
Parents: 897d270
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Mon Jul 28 10:33:37 2014 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Mon Jul 28 10:33:37 2014 +0200
----------------------------------------------------------------------
.../assets/JavaScriptStackAssembler.java | 4 +-
.../assets/JavaScriptStackAssemblerImpl.java | 8 ++--
.../javascript/ExtensibleJavaScriptStack.java | 16 ++++----
.../JavaScriptAggregationStrategy.java | 42 ++++++++++++++++++++
.../services/javascript/JavaScriptStack.java | 4 +-
.../JavascriptAggregationStrategy.java | 42 --------------------
.../services/javascript/StackExtension.java | 2 +-
.../services/javascript/StackExtensionType.java | 2 +-
.../t5/webresources/services/AppModule.java | 4 +-
9 files changed, 62 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74a066eb/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssembler.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssembler.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssembler.java
index dfede36..735c1e8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssembler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssembler.java
@@ -13,7 +13,7 @@
package org.apache.tapestry5.internal.services.assets;
import org.apache.tapestry5.services.assets.StreamableResource;
-import org.apache.tapestry5.services.javascript.JavascriptAggregationStrategy;
+import org.apache.tapestry5.services.javascript.JavaScriptAggregationStrategy;
import java.io.IOException;
@@ -34,5 +34,5 @@ public interface JavaScriptStackAssembler
* <p/>
* Expects the {@linkplain org.apache.tapestry5.services.LocalizationSetter#setNonPersistentLocaleFromLocaleName(String) non-persistent locale} to be set before invoking!
*/
- StreamableResource assembleJavaScriptResourceForStack(String stackName, boolean compress, JavascriptAggregationStrategy javascriptAggregationStrategy) throws IOException;
+ StreamableResource assembleJavaScriptResourceForStack(String stackName, boolean compress, JavaScriptAggregationStrategy javascriptAggregationStrategy) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74a066eb/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssemblerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssemblerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssemblerImpl.java
index 2c5200b..0b5c4f1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssemblerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssemblerImpl.java
@@ -21,7 +21,7 @@ import org.apache.tapestry5.ioc.services.ThreadLocale;
import org.apache.tapestry5.services.assets.*;
import org.apache.tapestry5.services.javascript.JavaScriptStack;
import org.apache.tapestry5.services.javascript.JavaScriptStackSource;
-import org.apache.tapestry5.services.javascript.JavascriptAggregationStrategy;
+import org.apache.tapestry5.services.javascript.JavaScriptAggregationStrategy;
import org.apache.tapestry5.services.javascript.ModuleManager;
import java.io.*;
@@ -60,9 +60,9 @@ public class JavaScriptStackAssemblerImpl implements JavaScriptStackAssembler
final boolean compress;
- final JavascriptAggregationStrategy javascriptAggregationStrategy;
+ final JavaScriptAggregationStrategy javascriptAggregationStrategy;
- private Parameters(Locale locale, String stackName, boolean compress, JavascriptAggregationStrategy javascriptAggregationStrategy)
+ private Parameters(Locale locale, String stackName, boolean compress, JavaScriptAggregationStrategy javascriptAggregationStrategy)
{
this.locale = locale;
this.stackName = stackName;
@@ -96,7 +96,7 @@ public class JavaScriptStackAssemblerImpl implements JavaScriptStackAssembler
resourceChangeTracker.clearOnInvalidation(cache);
}
- public StreamableResource assembleJavaScriptResourceForStack(String stackName, boolean compress, JavascriptAggregationStrategy javascriptAggregationStrategy) throws IOException
+ public StreamableResource assembleJavaScriptResourceForStack(String stackName, boolean compress, JavaScriptAggregationStrategy javascriptAggregationStrategy) throws IOException
{
Locale locale = threadLocale.getLocale();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74a066eb/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/ExtensibleJavaScriptStack.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/ExtensibleJavaScriptStack.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/ExtensibleJavaScriptStack.java
index 881f43c..1e1afce 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/ExtensibleJavaScriptStack.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/ExtensibleJavaScriptStack.java
@@ -53,7 +53,7 @@ public class ExtensibleJavaScriptStack implements JavaScriptStack
private final String initialization;
- private final JavascriptAggregationStrategy strategy;
+ private final JavaScriptAggregationStrategy strategy;
private final Predicate<StackExtension> by(final StackExtensionType type)
{
@@ -96,12 +96,12 @@ public class ExtensibleJavaScriptStack implements JavaScriptStack
;
};
- private final Mapper<String, JavascriptAggregationStrategy> stringToStrategy = new Mapper<String, JavascriptAggregationStrategy>()
+ private final Mapper<String, JavaScriptAggregationStrategy> stringToStrategy = new Mapper<String, JavaScriptAggregationStrategy>()
{
@Override
- public JavascriptAggregationStrategy map(String name)
+ public JavaScriptAggregationStrategy map(String name)
{
- return JavascriptAggregationStrategy.valueOf(name);
+ return JavaScriptAggregationStrategy.valueOf(name);
}
};
@@ -128,14 +128,14 @@ public class ExtensibleJavaScriptStack implements JavaScriptStack
strategy = toStrategy(extensions);
}
- private JavascriptAggregationStrategy toStrategy(Flow<StackExtension> extensions)
+ private JavaScriptAggregationStrategy toStrategy(Flow<StackExtension> extensions)
{
- List<JavascriptAggregationStrategy> values = extensions.filter(by(StackExtensionType.AGGREGATION_STRATEGY)).map(extractValue).map(stringToStrategy).toList();
+ List<JavaScriptAggregationStrategy> values = extensions.filter(by(StackExtensionType.AGGREGATION_STRATEGY)).map(extractValue).map(stringToStrategy).toList();
switch (values.size())
{
case 0:
- return JavascriptAggregationStrategy.COMBINE_AND_MINIMIZE;
+ return JavaScriptAggregationStrategy.COMBINE_AND_MINIMIZE;
case 1:
@@ -173,7 +173,7 @@ public class ExtensibleJavaScriptStack implements JavaScriptStack
}
@Override
- public JavascriptAggregationStrategy getJavaScriptAggregationStrategy()
+ public JavaScriptAggregationStrategy getJavaScriptAggregationStrategy()
{
return strategy;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74a066eb/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptAggregationStrategy.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptAggregationStrategy.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptAggregationStrategy.java
new file mode 100644
index 0000000..b220b9c
--- /dev/null
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptAggregationStrategy.java
@@ -0,0 +1,42 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.services.javascript;
+
+/**
+ * Used with {@link org.apache.tapestry5.services.javascript.JavaScriptStack} to identify how libraries and modules
+ * within the stack can be aggregated.
+ *
+ * @since 5.4
+ */
+public enum JavaScriptAggregationStrategy
+{
+ /**
+ * The default strategy is to combine all the assets and minimize them together.
+ */
+ COMBINE_AND_MINIMIZE,
+
+ /**
+ * Alternately, the assets can be combined, but not minimized (because some resources
+ * do not support minimization).
+ */
+ COMBINE_ONLY,
+
+ /**
+ * The assets are not combined or minimized at all.
+ */
+ DO_NOTHING;
+
+ public boolean enablesCombine() { return this != DO_NOTHING; }
+
+ public boolean enablesMinimize() { return this == COMBINE_AND_MINIMIZE; }
+}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74a066eb/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptStack.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptStack.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptStack.java
index f9f6285..b9f55d9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptStack.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptStack.java
@@ -75,11 +75,11 @@ public interface JavaScriptStack
/**
* Identifies how to aggregate JavaScript within the stack.
- * The default is {@link org.apache.tapestry5.services.javascript.JavascriptAggregationStrategy#COMBINE_AND_MINIMIZE}.
+ * The default is {@link org.apache.tapestry5.services.javascript.JavaScriptAggregationStrategy#COMBINE_AND_MINIMIZE}.
*
* @since 5.4
*/
- JavascriptAggregationStrategy getJavaScriptAggregationStrategy();
+ JavaScriptAggregationStrategy getJavaScriptAggregationStrategy();
/**
* Returns static JavaScript initialization for the stack. This block of JavaScript code will be added to the
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74a066eb/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptAggregationStrategy.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptAggregationStrategy.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptAggregationStrategy.java
deleted file mode 100644
index 9526e92..0000000
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavascriptAggregationStrategy.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry5.services.javascript;
-
-/**
- * Used with {@link org.apache.tapestry5.services.javascript.JavaScriptStack} to identify how libraries and modules
- * within the stack can be aggregated.
- *
- * @since 5.4
- */
-public enum JavascriptAggregationStrategy
-{
- /**
- * The default strategy is to combine all the assets and minimize them together.
- */
- COMBINE_AND_MINIMIZE,
-
- /**
- * Alternately, the assets can be combined, but not minimized (because some resources
- * do not support minimization).
- */
- COMBINE_ONLY,
-
- /**
- * The assets are not combined or minimized at all.
- */
- DO_NOTHING;
-
- public boolean enablesCombine() { return this != DO_NOTHING; }
-
- public boolean enablesMinimize() { return this == COMBINE_AND_MINIMIZE; }
-}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74a066eb/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtension.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtension.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtension.java
index 9c7b130..67cc22d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtension.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtension.java
@@ -87,7 +87,7 @@ public class StackExtension
*
* @since 5.4
*/
- public static StackExtension javascriptAggregation(JavascriptAggregationStrategy strategy)
+ public static StackExtension javascriptAggregation(JavaScriptAggregationStrategy strategy)
{
return new StackExtension(StackExtensionType.AGGREGATION_STRATEGY, strategy.name());
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74a066eb/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtensionType.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtensionType.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtensionType.java
index 4f0ade3..b6232f8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtensionType.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StackExtensionType.java
@@ -72,7 +72,7 @@ public enum StackExtensionType
/**
* Overrides the {@linkplain JavaScriptStack#getJavaScriptAggregationStrategy() JavaScript aggregation strategy}
- * for the stack. The value is string name of an {@link org.apache.tapestry5.services.javascript.JavascriptAggregationStrategy} value.
+ * for the stack. The value is string name of an {@link org.apache.tapestry5.services.javascript.JavaScriptAggregationStrategy} value.
*
* @since 5.4
*/
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74a066eb/tapestry-webresources/src/test/java/t5/webresources/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/java/t5/webresources/services/AppModule.java b/tapestry-webresources/src/test/java/t5/webresources/services/AppModule.java
index 953fa07..3a14386 100644
--- a/tapestry-webresources/src/test/java/t5/webresources/services/AppModule.java
+++ b/tapestry-webresources/src/test/java/t5/webresources/services/AppModule.java
@@ -11,7 +11,7 @@ import org.apache.tapestry5.services.Core;
import org.apache.tapestry5.services.compatibility.Compatibility;
import org.apache.tapestry5.services.compatibility.Trait;
import org.apache.tapestry5.services.javascript.JavaScriptStack;
-import org.apache.tapestry5.services.javascript.JavascriptAggregationStrategy;
+import org.apache.tapestry5.services.javascript.JavaScriptAggregationStrategy;
import org.apache.tapestry5.services.javascript.StackExtension;
import org.apache.tapestry5.services.javascript.StackExtensionType;
import org.apache.tapestry5.webresources.modules.WebResourcesModule;
@@ -39,7 +39,7 @@ public class AppModule
@Core
public static void overrideBootstrapCSS(OrderedConfiguration<StackExtension> configuration)
{
- // configuration.add("ForTestingOnly", StackExtension.javascriptAggregation(JavascriptAggregationStrategy.DO_NOTHING));
+ // configuration.add("ForTestingOnly", StackExtension.javascriptAggregation(JavaScriptAggregationStrategy.DO_NOTHING));
configuration.override("bootstrap.css",
new StackExtension(StackExtensionType.STYLESHEET, "context:bootstrap/less/bootstrap.less"), "before:tapestry.css");