You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2006/07/25 04:02:31 UTC
svn commit: r425256 - in /tapestry/tapestry5/tapestry-core/trunk: .classpath
.project src/main/java/org/apache/tapestry/internal/util/Orderer.java
Author: hlship
Date: Mon Jul 24 19:02:31 2006
New Revision: 425256
URL: http://svn.apache.org/viewvc?rev=425256&view=rev
Log:
Remove some generics warnings from Orderer.
Modified:
tapestry/tapestry5/tapestry-core/trunk/.classpath
tapestry/tapestry5/tapestry-core/trunk/.project
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/Orderer.java
Modified: tapestry/tapestry5/tapestry-core/trunk/.classpath
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/.classpath?rev=425256&r1=425255&r2=425256&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/.classpath (original)
+++ tapestry/tapestry5/tapestry-core/trunk/.classpath Mon Jul 24 19:02:31 2006
@@ -7,7 +7,7 @@
<classpathentry kind="lib" path="src/test/resources"/>
<classpathentry kind="lib" path="src/test/conf"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="ASPECTJRT_LIB"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="var" path="ASPECTJRT_LIB"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: tapestry/tapestry5/tapestry-core/trunk/.project
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/.project?rev=425256&r1=425255&r2=425256&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/.project (original)
+++ tapestry/tapestry5/tapestry-core/trunk/.project Mon Jul 24 19:02:31 2006
@@ -17,8 +17,8 @@
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.ajdt.ui.ajnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.ajdt.ui.ajnature</nature>
</natures>
</projectDescription>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/Orderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/Orderer.java?rev=425256&r1=425255&r2=425256&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/Orderer.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/Orderer.java Mon Jul 24 19:02:31 2006
@@ -39,7 +39,7 @@
private final List<Orderable> _orderables = newList();
- private final Map<String, Orderable> _orderablesById = newMap();
+ private final Map<String, Orderable<T>> _orderablesById = newMap();
private final Map<String, DependencyNode<T>> _dependencyNodesById = newMap();
@@ -70,13 +70,13 @@
@SuppressNullCheck
public void add(String id, T target)
{
- add(new Orderable(id, target));
+ add(new Orderable<T>(id, target));
}
@SuppressNullCheck
public void add(String id, String prereqs, String postreqs, T target)
{
- add(new Orderable(id, prereqs, postreqs, target));
+ add(new Orderable<T>(id, prereqs, postreqs, target));
}
@OneShot.Lockdown
@@ -104,10 +104,10 @@
addNodes();
if (_leader == null)
- _leader = new DependencyNode(_log, new Orderable<T>("*-leader-*", null));
+ _leader = new DependencyNode<T>(_log, new Orderable<T>("*-leader-*", null));
if (_trailer == null)
- _trailer = new DependencyNode(_log, new Orderable<T>("*-trailer-*", null));
+ _trailer = new DependencyNode<T>(_log, new Orderable<T>("*-trailer-*", null));
addDependencies();
}