You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/03/06 15:12:33 UTC
[1/4] git commit: Java 7 diamonds
Repository: wicket
Updated Branches:
refs/heads/master e059351fb -> d2695345f
Java 7 diamonds
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8c3d270f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8c3d270f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8c3d270f
Branch: refs/heads/master
Commit: 8c3d270fdf483c93cda67eff4204e61199f5cc22
Parents: e059351
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 16:02:58 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 16:02:58 2014 +0200
----------------------------------------------------------------------
.../org/apache/wicket/markup/resolver/AutoLinkResolver.java | 6 +++---
.../java/org/apache/wicket/pageStore/DefaultPageStore.java | 2 +-
.../src/main/java/org/apache/wicket/util/string/Entities.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/8c3d270f/wicket-core/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
index bf3f073..2bde33f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
@@ -408,7 +408,7 @@ public final class AutoLinkResolver implements IComponentResolver
* Set of supported extensions for creating bookmarkable page links. Anything that is not in
* this list will be handled as a resource reference.
*/
- private final Set<String> supportedPageExtensions = new HashSet<String>(4);
+ private final Set<String> supportedPageExtensions = new HashSet<>(4);
/**
* Construct.
@@ -749,13 +749,13 @@ public final class AutoLinkResolver implements IComponentResolver
* Autolink resolver delegates for constructing new autolinks reference keyed on tag name (such
* as <script> or <a>.
*/
- private final Map<String, IAutolinkResolverDelegate> tagNameToAutolinkResolverDelegates = new HashMap<String, IAutolinkResolverDelegate>();
+ private final Map<String, IAutolinkResolverDelegate> tagNameToAutolinkResolverDelegates = new HashMap<>();
/**
* Resolver objects that know what attribute to read for getting the reference keyed on tag name
* (such as <script> or <a>.
*/
- private final Map<String, ITagReferenceResolver> tagNameToTagReferenceResolvers = new HashMap<String, ITagReferenceResolver>();
+ private final Map<String, ITagReferenceResolver> tagNameToTagReferenceResolvers = new HashMap<>();
/**
* Construct.
http://git-wip-us.apache.org/repos/asf/wicket/blob/8c3d270f/wicket-core/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java b/wicket-core/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java
index 70fc18d..1e44ef0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java
+++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java
@@ -421,7 +421,7 @@ public class DefaultPageStore implements IPageStore
public SerializedPagesCache(final int size)
{
this.size = size;
- cache = new ArrayList<SoftReference<SerializedPage>>(size);
+ cache = new ArrayList<>(size);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/8c3d270f/wicket-util/src/main/java/org/apache/wicket/util/string/Entities.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/Entities.java b/wicket-util/src/main/java/org/apache/wicket/util/string/Entities.java
index 3f17a86..9f2b08b 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/Entities.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/Entities.java
@@ -462,7 +462,7 @@ class Entities
{
private final Map<String, Integer> mapNameToValue = Generics.newHashMap();
- private final IntHashMap<String> mapValueToName = new IntHashMap<String>();
+ private final IntHashMap<String> mapValueToName = new IntHashMap<>();
// TODO not thread-safe as there is a window between changing the two maps
@Override
[3/4] git commit: Make constants - private static final
Posted by mg...@apache.org.
Make constants - private static final
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8c8f26b7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8c8f26b7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8c8f26b7
Branch: refs/heads/master
Commit: 8c8f26b75db95cc1b504346fae23936e2e2b6579
Parents: 0036f14
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 16:04:28 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 16:04:28 2014 +0200
----------------------------------------------------------------------
.../wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java | 2 +-
.../java/org/apache/wicket/page/DefaultPageManagerContext.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/8c8f26b7/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
index e69ee1e..51ddacd 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
@@ -35,7 +35,7 @@ public final class DefaultMarkupSourcingStrategy extends AbstractMarkupSourcingS
/** Log for reporting. */
private static final Logger log = LoggerFactory.getLogger(DefaultMarkupSourcingStrategy.class);
- private static DefaultMarkupSourcingStrategy instance = new DefaultMarkupSourcingStrategy();
+ private static final DefaultMarkupSourcingStrategy instance = new DefaultMarkupSourcingStrategy();
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/8c8f26b7/wicket-core/src/main/java/org/apache/wicket/page/DefaultPageManagerContext.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/page/DefaultPageManagerContext.java b/wicket-core/src/main/java/org/apache/wicket/page/DefaultPageManagerContext.java
index 4dde57d..78f4b49 100644
--- a/wicket-core/src/main/java/org/apache/wicket/page/DefaultPageManagerContext.java
+++ b/wicket-core/src/main/java/org/apache/wicket/page/DefaultPageManagerContext.java
@@ -29,7 +29,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
*/
public class DefaultPageManagerContext implements IPageManagerContext
{
- private final MetaDataKey<Object> requestCycleMetaDataKey = new MetaDataKey<Object>()
+ private static final MetaDataKey<Object> requestCycleMetaDataKey = new MetaDataKey<Object>()
{
private static final long serialVersionUID = 1L;
};
[2/4] git commit: Intern some strings which appear in the top
duplicates in Yourkit memory profile when running
ComponentQueueingPerformanceTest
Posted by mg...@apache.org.
Intern some strings which appear in the top duplicates in Yourkit memory profile when running ComponentQueueingPerformanceTest
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0036f14c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0036f14c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0036f14c
Branch: refs/heads/master
Commit: 0036f14c33ffb548cdc8adf9ebf17cec34a73c1f
Parents: 8c3d270
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 16:03:27 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 16:03:27 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/markup/MarkupResourceStream.java | 2 +-
.../src/main/java/org/apache/wicket/markup/parser/XmlTag.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0036f14c/wicket-core/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
index 6e11b8b..3f70c0e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
@@ -261,7 +261,7 @@ public class MarkupResourceStream implements IResourceStream, IFixedLocationReso
public final void setWicketNamespace(final String wicketNamespace)
{
this.wicketNamespace = wicketNamespace;
- wicketId = wicketNamespace + ":id";
+ wicketId = (wicketNamespace + ":id").intern();
if (!MarkupParser.WICKET.equals(wicketNamespace) && log.isDebugEnabled())
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/0036f14c/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
index fc50131..cd3b6d3 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
@@ -458,7 +458,7 @@ public class XmlTag
{
if (isMutable)
{
- this.name = name;
+ this.name = name.intern();
}
else
{
@@ -476,7 +476,7 @@ public class XmlTag
{
if (isMutable)
{
- this.namespace = namespace;
+ this.namespace = namespace.intern();
}
else
{
[4/4] git commit: Append character instead of String where possible.
Add a check for null before interning the namespace
Posted by mg...@apache.org.
Append character instead of String where possible.
Add a check for null before interning the namespace
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d2695345
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d2695345
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d2695345
Branch: refs/heads/master
Commit: d2695345f52a9785e7338a1f6e823eec9dcc243d
Parents: 8c8f26b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 16:11:47 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 16:11:47 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/markup/parser/XmlTag.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d2695345/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
index cd3b6d3..8602db4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
@@ -476,7 +476,7 @@ public class XmlTag
{
if (isMutable)
{
- this.namespace = namespace.intern();
+ this.namespace = namespace != null ? namespace.intern() : null;
}
else
{
@@ -597,7 +597,7 @@ public class XmlTag
if ((key != null) &&
((attributeToBeIgnored == null) || !key.equalsIgnoreCase(attributeToBeIgnored)))
{
- buffer.append(" ");
+ buffer.append(' ');
buffer.append(key);
CharSequence value = getAttribute(key);
@@ -607,7 +607,7 @@ public class XmlTag
buffer.append("=\"");
value = Strings.escapeMarkup(value);
buffer.append(value);
- buffer.append("\"");
+ buffer.append('"');
}
}
}