You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bs...@apache.org on 2014/07/22 06:13:51 UTC
svn commit: r1612454 [2/2] - in /myfaces/trinidad-maven/trunk: ./
maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/
maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/
maven-faces-plug...
Modified: myfaces/trinidad-maven/trunk/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java?rev=1612454&r1=1612453&r2=1612454&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java (original)
+++ myfaces/trinidad-maven/trunk/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java Tue Jul 22 04:13:50 2014
@@ -31,6 +31,7 @@ import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Enumeration;
@@ -68,11 +69,8 @@ import org.apache.myfaces.trinidadbuild.
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.PropertyBean;
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.ScreenshotBean;
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.ValidatorBean;
-import org.apache.myfaces.trinidadbuild.plugin.faces.util.ComponentFilter;
-import org.apache.myfaces.trinidadbuild.plugin.faces.util.ConverterFilter;
+import org.apache.myfaces.trinidadbuild.plugin.faces.util.Filter;
import org.apache.myfaces.trinidadbuild.plugin.faces.util.FilteredIterator;
-import org.apache.myfaces.trinidadbuild.plugin.faces.util.PropertyFilter;
-import org.apache.myfaces.trinidadbuild.plugin.faces.util.ValidatorFilter;
import org.apache.myfaces.trinidadbuild.plugin.faces.util.XIncludeFilter;
import org.codehaus.doxia.sink.Sink;
@@ -101,7 +99,7 @@ public class TagdocReport extends Abstra
factory.setSiteDirectory(getOutputDirectory());
setSinkFactory(factory);
- processIndex(project, resourcePath);
+ processIndex(project);
try
{
_generateTagDocs();
@@ -125,14 +123,14 @@ public class TagdocReport extends Abstra
// components Iterator will be used when actually writing out the tag doc
// compIter Iterator will be used when creating the maps of component relationships
Iterator<ComponentBean> components = facesConfig.components();
- components = new FilteredIterator(components, new SkipFilter());
- components = new FilteredIterator(components, new ComponentTagFilter());
- components = new FilteredIterator(components, new ComponentNamespaceFilter());
+ components = new FilteredIterator<ComponentBean>(components, new SkipFilter());
+ components = new FilteredIterator<ComponentBean>(components, new ComponentTagFilter());
+ components = new FilteredIterator<ComponentBean>(components, new ComponentNamespaceFilter());
Iterator<ComponentBean> compIter = facesConfig.components();
- compIter = new FilteredIterator(compIter, new SkipFilter());
- compIter = new FilteredIterator(compIter, new ComponentTagFilter());
- compIter = new FilteredIterator(compIter, new ComponentNamespaceFilter());
+ compIter = new FilteredIterator<ComponentBean>(compIter, new SkipFilter());
+ compIter = new FilteredIterator<ComponentBean>(compIter, new ComponentTagFilter());
+ compIter = new FilteredIterator<ComponentBean>(compIter, new ComponentNamespaceFilter());
// compTypeMap holds a map of compononent types to tag names that implement that component type
// The map is built using getComponentType method on the component bean to determine the
@@ -190,12 +188,12 @@ public class TagdocReport extends Abstra
}
Iterator<ValidatorBean> validators = facesConfig.validators();
- validators = new FilteredIterator(validators, new ValidatorTagFilter());
- validators = new FilteredIterator(validators, new ValidatorNamespaceFilter());
+ validators = new FilteredIterator<ValidatorBean>(validators, new ValidatorTagFilter());
+ validators = new FilteredIterator<ValidatorBean>(validators, new ValidatorNamespaceFilter());
Iterator<ConverterBean> converters = facesConfig.converters();
- converters = new FilteredIterator(converters, new ConverterTagFilter());
- converters = new FilteredIterator(converters, new ConverterNamespaceFilter());
+ converters = new FilteredIterator<ConverterBean>(converters, new ConverterTagFilter());
+ converters = new FilteredIterator<ConverterBean>(converters, new ConverterNamespaceFilter());
// =-=AEW Note that only updating out-of-date components, etc. is
// permanently tricky, even if we had proper detection in place,
@@ -208,9 +206,9 @@ public class TagdocReport extends Abstra
}
*/
- Set componentPages = new TreeSet();
- Set converterPages = new TreeSet();
- Set validatorPages = new TreeSet();
+ Set<String> componentPages = new TreeSet<String>();
+ Set<String> converterPages = new TreeSet<String>();
+ Set<String> validatorPages = new TreeSet<String>();
int count = 0;
while (components.hasNext())
@@ -242,7 +240,7 @@ public class TagdocReport extends Abstra
}
- Set otherPages = _gatherOtherTags();
+ Set<String> otherPages = _gatherOtherTags();
getLog().info("Generated " + count + " page(s)");
@@ -259,23 +257,23 @@ public class TagdocReport extends Abstra
sink.sectionTitle1_();
sink.section1();
- for (Iterator<Map.Entry> i = taglibs.entrySet().iterator(); i.hasNext(); )
+ for (Iterator<Map.Entry<String, String>> i = taglibs.entrySet().iterator(); i.hasNext(); )
{
- Map.Entry entry = i.next();
+ Map.Entry<String, String> entry = i.next();
sink.paragraph();
sink.bold();
sink.text("Short name:");
sink.bold_();
sink.nonBreakingSpace();
- sink.text(entry.getKey().toString());
+ sink.text(entry.getKey());
sink.lineBreak();
sink.bold();
sink.text("Namespace:");
sink.bold_();
sink.nonBreakingSpace();
- sink.text(entry.getValue().toString());
+ sink.text(entry.getValue());
sink.lineBreak();
sink.paragraph_();
@@ -291,9 +289,9 @@ public class TagdocReport extends Abstra
sink.body_();
}
- private Set _gatherOtherTags()
+ private Set<String> _gatherOtherTags()
{
- TreeSet set = new TreeSet();
+ Set<String> set = new TreeSet<String>();
String subDir =
_platformAgnosticPath(_platformAgnosticPath("xdoc/" +
_DOC_SUBDIRECTORY));
@@ -428,7 +426,7 @@ public class TagdocReport extends Abstra
return formatted;
}
- private void _writeIndexSection(Sink sink, Set pages, String title)
+ private void _writeIndexSection(Sink sink, Set<String> pages, String title)
{
if (pages.isEmpty())
return;
@@ -489,11 +487,11 @@ public class TagdocReport extends Abstra
if (namespace == null)
return null;
- for (Iterator<Map.Entry> i = taglibs.entrySet().iterator(); i.hasNext(); )
+ for (Iterator<Map.Entry<String, String>> i = taglibs.entrySet().iterator(); i.hasNext(); )
{
- Map.Entry entry = i.next();
+ Map.Entry<String, String> entry = i.next();
if (namespace.equals(entry.getValue()))
- return (String) entry.getKey();
+ return entry.getKey();
}
return "unknown";
@@ -858,13 +856,15 @@ public class TagdocReport extends Abstra
}
- private class GroupComparator implements Comparator
+ private class GroupComparator implements Comparator<String>
{
- public int compare(Object o1, Object o2)
+ @Override
+ public int compare(String o1, String o2)
{
return _getGroupIndex(o1) - _getGroupIndex(o2);
}
+ @Override
public boolean equals(Object o)
{
return (o instanceof GroupComparator);
@@ -874,9 +874,6 @@ public class TagdocReport extends Abstra
{
String s = (o == null) ? null : o.toString();
-
-
-
if ("message".equalsIgnoreCase(s))
{
return 0;
@@ -902,9 +899,9 @@ public class TagdocReport extends Abstra
private void _writeComponentAttributes(Writer out, ComponentBean bean) throws IOException
{
// Sort the names
- TreeSet<String> attributes = new TreeSet<String>();
+ Collection<String> attributes = new TreeSet<String>();
Iterator<PropertyBean> attrs = bean.properties(true);
- attrs = new FilteredIterator(attrs, new NonHiddenFilter());
+ attrs = new FilteredIterator<PropertyBean>(attrs, new NonHiddenFilter());
while (attrs.hasNext())
{
@@ -922,7 +919,7 @@ public class TagdocReport extends Abstra
list.add(bean.findProperty(attrName, true));
}
- TreeSet<String> groups = new TreeSet<String>(new GroupComparator());
+ Set<String> groups = new TreeSet<String>(new GroupComparator());
/* No current support for grouping
// Make sure "null" is the representative for unknown groups
Iterator iter = attributes.iterator();
@@ -952,7 +949,7 @@ public class TagdocReport extends Abstra
private void _writeConverterAttributes(Writer out, ConverterBean bean) throws IOException
{
// Sort the names
- TreeSet attributes = new TreeSet();
+ Collection<String> attributes = new TreeSet<String>();
Iterator<PropertyBean> attrs = bean.properties();
while (attrs.hasNext())
{
@@ -962,7 +959,7 @@ public class TagdocReport extends Abstra
}
// Now get a list of PropertyBeans
- List list = new ArrayList();
+ List<PropertyBean> list = new ArrayList<PropertyBean>();
Iterator<String> iter = attributes.iterator();
while (iter.hasNext())
{
@@ -981,7 +978,7 @@ public class TagdocReport extends Abstra
private void _writeValidatorAttributes(Writer out, ValidatorBean bean) throws IOException
{
// Sort the names
- TreeSet attributes = new TreeSet();
+ Collection<String> attributes = new TreeSet<String>();
Iterator<PropertyBean> attrs = bean.properties();
while (attrs.hasNext())
{
@@ -991,7 +988,7 @@ public class TagdocReport extends Abstra
}
// Now get a list of PropertyBeans
- List list = new ArrayList();
+ List<PropertyBean> list = new ArrayList<PropertyBean>();
Iterator<String> iter = attributes.iterator();
while (iter.hasNext())
{
@@ -1279,7 +1276,7 @@ public class TagdocReport extends Abstra
private void _writeComponentFacets(Writer out, ComponentBean bean, Map<String, List<QName>> compTypeMap) throws IOException
{
// Sort the facets
- TreeSet facetNames = new TreeSet();
+ Collection<String> facetNames = new TreeSet<String>();
Iterator<FacetBean> iter = bean.facets(true);
while (iter.hasNext())
{
@@ -1596,8 +1593,7 @@ public class TagdocReport extends Abstra
}
protected void processIndex(
- MavenProject project,
- String resourcePath) throws MavenReportException
+ MavenProject project) throws MavenReportException
{
_facesConfig = new FacesConfigBean();
@@ -1627,14 +1623,14 @@ public class TagdocReport extends Abstra
}
- protected List getMasterConfigs(
+ protected List<URL> getMasterConfigs(
MavenProject project) throws MavenReportException
{
String resourcePath = "META-INF/maven-faces-plugin/faces-config.xml";
return getCompileDependencyResources(project, resourcePath);
}
- protected List getCompileDependencyResources(
+ protected List<URL> getCompileDependencyResources(
MavenProject project,
String resourcePath) throws MavenReportException
{
@@ -1642,7 +1638,7 @@ public class TagdocReport extends Abstra
{
ClassLoader cl = createCompileClassLoader(project);
Enumeration e = cl.getResources(resourcePath);
- List urls = new ArrayList();
+ List<URL> urls = new ArrayList<URL>();
while (e.hasMoreElements())
{
URL url = (URL)e.nextElement();
@@ -1664,7 +1660,7 @@ public class TagdocReport extends Abstra
try
{
// 1. read master faces-config.xml resources
- List masters = getMasterConfigs(project);
+ List<URL> masters = getMasterConfigs(project);
if (masters.isEmpty())
{
getLog().warn("Master faces-config.xml not found");
@@ -1672,7 +1668,7 @@ public class TagdocReport extends Abstra
}
else
{
- List entries = new LinkedList();
+ List<URL> entries = new LinkedList<URL>();
SAXParserFactory spf = SAXParserFactory.newInstance();
spf.setNamespaceAware(true);
@@ -1697,7 +1693,7 @@ public class TagdocReport extends Abstra
digester.parse(url.openStream());
}
- return (URL[])entries.toArray(new URL[0]);
+ return entries.toArray(new URL[entries.size()]);
}
}
catch (ParserConfigurationException e)
@@ -1722,7 +1718,7 @@ public class TagdocReport extends Abstra
try
{
- List classpathElements = project.getCompileClasspathElements();
+ List<String> classpathElements = project.getCompileClasspathElements();
if (!classpathElements.isEmpty())
{
String[] entries = (String[]) classpathElements.toArray(new String[0]);
@@ -1760,10 +1756,10 @@ public class TagdocReport extends Abstra
}
}
- static protected class SkipFilter extends ComponentFilter
+ static protected class SkipFilter implements Filter<ComponentBean>
{
- protected boolean accept(
- ComponentBean component)
+ @Override
+ public boolean accept(ComponentBean component)
{
String componentType = component.getComponentType();
@@ -1773,14 +1769,14 @@ public class TagdocReport extends Abstra
}
}
- private class ComponentNamespaceFilter extends ComponentFilter
+ private class ComponentNamespaceFilter implements Filter<ComponentBean>
{
public ComponentNamespaceFilter()
{
}
- protected boolean accept(
- ComponentBean component)
+ @Override
+ public boolean accept(ComponentBean component)
{
if (component.getTagName() == null)
return false;
@@ -1789,14 +1785,14 @@ public class TagdocReport extends Abstra
}
}
- private class ValidatorNamespaceFilter extends ValidatorFilter
+ private class ValidatorNamespaceFilter implements Filter<ValidatorBean>
{
public ValidatorNamespaceFilter()
{
}
- protected boolean accept(
- ValidatorBean component)
+ @Override
+ public boolean accept(ValidatorBean component)
{
if (component.getTagName() == null)
return false;
@@ -1805,14 +1801,14 @@ public class TagdocReport extends Abstra
}
}
- private class ConverterNamespaceFilter extends ConverterFilter
+ private class ConverterNamespaceFilter implements Filter<ConverterBean>
{
public ConverterNamespaceFilter()
{
}
- protected boolean accept(
- ConverterBean component)
+ @Override
+ public boolean accept(ConverterBean component)
{
if (component.getTagName() == null)
return false;
@@ -1821,46 +1817,46 @@ public class TagdocReport extends Abstra
}
}
- static final protected class TagAttributeFilter extends PropertyFilter
+ static final protected class TagAttributeFilter implements Filter<PropertyBean>
{
- protected boolean accept(
- PropertyBean property)
+ @Override
+ public boolean accept(PropertyBean property)
{
return (!property.isTagAttributeExcluded());
}
}
- static final protected class ComponentTagFilter extends ComponentFilter
+ static final protected class ComponentTagFilter implements Filter<ComponentBean>
{
- protected boolean accept(
- ComponentBean component)
+ @Override
+ public boolean accept(ComponentBean component)
{
return (component.getTagName() != null);
}
}
- static final protected class ConverterTagFilter extends ConverterFilter
+ static final protected class ConverterTagFilter implements Filter<ConverterBean>
{
- protected boolean accept(
- ConverterBean converter)
+ @Override
+ public boolean accept(ConverterBean converter)
{
return (converter.getTagClass() != null);
}
}
- static final protected class ValidatorTagFilter extends ValidatorFilter
+ static final protected class ValidatorTagFilter implements Filter<ValidatorBean>
{
- protected boolean accept(
- ValidatorBean validator)
+ @Override
+ public boolean accept(ValidatorBean validator)
{
return (validator.getTagClass() != null);
}
}
- final protected static class NonHiddenFilter extends PropertyFilter
+ final protected static class NonHiddenFilter implements Filter<PropertyBean>
{
- protected boolean accept(
- PropertyBean property)
+ @Override
+ public boolean accept(PropertyBean property)
{
return (!property.isHidden());
}
@@ -1904,7 +1900,7 @@ public class TagdocReport extends Abstra
* @parameter
* @required
*/
- private Map taglibs;
+ private Map<String, String> taglibs;
/**
* @parameter expression="META-INF/maven-faces-plugin/faces-config.xml"
Modified: myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/AbstractGenerateSourcesMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/AbstractGenerateSourcesMojo.java?rev=1612454&r1=1612453&r2=1612454&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/AbstractGenerateSourcesMojo.java (original)
+++ myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/AbstractGenerateSourcesMojo.java Tue Jul 22 04:13:50 2014
@@ -21,7 +21,6 @@ package org.apache.myfaces.trinidadbuild
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.util.Arrays;
import java.util.Map;
@@ -95,15 +94,15 @@ abstract public class AbstractGenerateSo
if (xrtsFiles.length > 0)
{
RTSWriter writer = getRTSWriter();
- Map params = new HashMap();
+ Map<String, Object> params = new HashMap<String, Object>();
- List dirtyXRTS = new LinkedList(Arrays.asList(xrtsFiles));
+ List<String> dirtyXRTS = new LinkedList<String>(Arrays.asList(xrtsFiles));
SAXParserFactory factory = SAXParserFactory.newInstance();
factory.setValidating(false);
- for (Iterator i=dirtyXRTS.iterator(); i.hasNext();)
+ for (Iterator<String> i = dirtyXRTS.iterator(); i.hasNext();)
{
- String xrtsFile = (String)i.next();
+ String xrtsFile = i.next();
File targetFile = getTargetFile(xrtsFile);
if (targetFile.exists())
{
@@ -123,9 +122,9 @@ abstract public class AbstractGenerateSo
{
getLog().info("Generating " + dirtyXRTS.size() + " XRTS bundles to " + getTargetDirectory());
- for (Iterator i=dirtyXRTS.iterator(); i.hasNext();)
+ for (Iterator<String> i = dirtyXRTS.iterator(); i.hasNext();)
{
- String xrtsFile = (String)i.next();
+ String xrtsFile = i.next();
File sourceFile = getSourceFile(xrtsFile);
File targetFile = getTargetFile(xrtsFile);
String baseName = getBasename(xrtsFile);
Modified: myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateSourcesMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateSourcesMojo.java?rev=1612454&r1=1612453&r2=1612454&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateSourcesMojo.java (original)
+++ myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateSourcesMojo.java Tue Jul 22 04:13:50 2014
@@ -66,31 +66,37 @@ public class GenerateSourcesMojo extends
*/
private File targetDirectory;
+ @Override
protected String[] getDefaultLocales()
{
return defaultLocales;
}
+ @Override
protected String[] getExcludes()
{
return excludes;
}
+ @Override
protected void addCompileSourceRoot() throws IOException
{
project.addCompileSourceRoot(targetDirectory.getCanonicalPath());
}
+ @Override
protected String getTargetType()
{
return targetType;
}
+ @Override
protected File getSourceDirectory()
{
return sourceDirectory;
}
+ @Override
protected File getTargetDirectory()
{
return targetDirectory;
Modified: myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateTestSourcesMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateTestSourcesMojo.java?rev=1612454&r1=1612453&r2=1612454&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateTestSourcesMojo.java (original)
+++ myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateTestSourcesMojo.java Tue Jul 22 04:13:50 2014
@@ -66,31 +66,37 @@ public class GenerateTestSourcesMojo ext
*/
private File targetDirectory;
+ @Override
protected String[] getDefaultLocales()
{
return defaultLocales;
}
+ @Override
protected String[] getExcludes()
{
return testExcludes;
}
+ @Override
protected void addCompileSourceRoot() throws IOException
{
project.addTestCompileSourceRoot(targetDirectory.getCanonicalPath());
}
+ @Override
protected String getTargetType()
{
return targetType;
}
+ @Override
protected File getSourceDirectory()
{
return testSourceDirectory;
}
+ @Override
protected File getTargetDirectory()
{
return targetDirectory;
Modified: myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/ListRTSWriter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/ListRTSWriter.java?rev=1612454&r1=1612453&r2=1612454&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/ListRTSWriter.java (original)
+++ myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/ListRTSWriter.java Tue Jul 22 04:13:50 2014
@@ -23,7 +23,6 @@ import java.io.File;
import java.io.FileWriter;
import java.io.PrintWriter;
import java.util.Map;
-//import java.util.StringTokenizer;
/**
@@ -53,7 +52,8 @@ public class ListRTSWriter implements RT
* @param meta a <code>Map</code> of parsed non-resource data
* (e.g., authors).
*/
- public void startBundle(Map parms, Map meta)
+ @Override
+ public void startBundle(Map<String, ?> parms, Map<String, ?> meta)
throws Throwable
{
File outFile = (File)parms.get("outFile");
@@ -139,12 +139,15 @@ public class ListRTSWriter implements RT
}
- protected void writeImports(Map parms, Map meta)
+ protected void writeImports(@SuppressWarnings("unused") Map<String, ?> parms,
+ @SuppressWarnings("unused") Map<String, ?> meta)
throws Throwable
{
+ // do nothing
}
- public void writeString(Map parms, Map meta, String key,
+ @Override
+ public void writeString(Map<String, ?> parms, Map<String, ?> meta, String key,
String value) throws Throwable
{
_pw.println(" {\"" + UnicodeEscapes.convert(key) + "\", \"" +
@@ -161,7 +164,8 @@ public class ListRTSWriter implements RT
* @param meta a <code>Map</code> of parsed non-resource data
* (e.g., authors).
*/
- public void endBundle(Map parms, Map meta) throws Throwable
+ @Override
+ public void endBundle(Map<String, ?> parms, Map<String, ?> meta) throws Throwable
{
_pw.println(" };");
_pw.println(" }");
Modified: myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/RTSWriter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/RTSWriter.java?rev=1612454&r1=1612453&r2=1612454&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/RTSWriter.java (original)
+++ myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/RTSWriter.java Tue Jul 22 04:13:50 2014
@@ -39,13 +39,13 @@ public interface RTSWriter
{
/**
- * Writes the <file or other output header(s).
+ * Writes the file or other output header(s).
*
* @param parms a <code>Map</code> of command line parameters.
* @param meta a <code>Map</code> of parsed non-resource data
* (e.g., package).
*/
- public void startBundle(Map parms, Map meta)
+ public void startBundle(Map<String, ?> parms, Map<String, ?> meta)
throws Throwable;
/**
@@ -67,7 +67,7 @@ public interface RTSWriter
* @param key a <code>String</code> key.
* @param value a <code>String</code> value.
*/
- public void writeString(Map parms, Map meta, String key,
+ public void writeString(Map<String, ?> parms, Map<String, ?> meta, String key,
String value) throws Throwable;
/**
@@ -77,6 +77,6 @@ public interface RTSWriter
* @param meta a <code>Map</code> of parsed non-resource data
* (e.g., package).
*/
- public void endBundle(Map parms, Map meta) throws Throwable;
+ public void endBundle(Map<String, ?> parms, Map<String, ?> meta) throws Throwable;
}
Modified: myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/XRTSGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/XRTSGenerator.java?rev=1612454&r1=1612453&r2=1612454&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/XRTSGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/XRTSGenerator.java Tue Jul 22 04:13:50 2014
@@ -23,9 +23,6 @@ import java.util.Map;
import javax.xml.parsers.SAXParser;
import org.xml.sax.InputSource;
-import org.xml.sax.Parser;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
/**
* The <code>XRTSGenerator</code> class is a online facility (as opposed to the
@@ -49,7 +46,7 @@ public final class XRTSGenerator
*
*/
public static void generate(SAXParser parser, InputSource is, RTSWriter rtsw,
- Map parms) throws Throwable
+ Map<String, ?> parms) throws Throwable
{
XRTSParser rtsp = new XRTSParser(rtsw, parms);
parser.parse(is, rtsp);
Modified: myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/XRTSParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/XRTSParser.java?rev=1612454&r1=1612453&r2=1612454&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/XRTSParser.java (original)
+++ myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/XRTSParser.java Tue Jul 22 04:13:50 2014
@@ -22,14 +22,11 @@ import java.util.Map;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
-import java.util.List;
import org.xml.sax.AttributeList;
import org.xml.sax.HandlerBase;
-import org.xml.sax.InputSource;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
/**
* */
@@ -44,7 +41,7 @@ final class XRTSParser extends HandlerBa
{
}
- public XRTSParser(RTSWriter bw, Map parms)
+ public XRTSParser(RTSWriter bw, Map<String, ?> parms)
{
_bundleWriter = bw;
_parms = parms;
@@ -58,6 +55,7 @@ final class XRTSParser extends HandlerBa
*
* @param locator A locator for all SAX document events.
*/
+ @Override
public void setDocumentLocator (Locator locator)
{
_locator = locator;
@@ -78,6 +76,7 @@ final class XRTSParser extends HandlerBa
* Receive notification of the end of the document.
* SAX Parser event for finding the end of an XML-based RTS document
*/
+ @Override
public void endDocument() throws SAXException
{
// System.out.println("EndDocument");
@@ -97,6 +96,7 @@ final class XRTSParser extends HandlerBa
* @param name the element type name.
* @param attributes the specified or defaulted attributes.
*/
+ @Override
public void startElement(String name, AttributeList atts) throws SAXException
{
_nestingLevel++;
@@ -144,6 +144,7 @@ final class XRTSParser extends HandlerBa
* Receive notification of the end of an element.
* @param name the element type name.
*/
+ @Override
public void endElement(String name) throws SAXException
{
if ((_nestingLevel == 2) && name.equals("resource"))
@@ -169,6 +170,7 @@ final class XRTSParser extends HandlerBa
* @param start the start position in the character array.
* @param length the number of characters to use from the character array.
*/
+ @Override
public void ignorableWhitespace(char[] cbuf, int start, int len)
throws SAXException
{
@@ -182,6 +184,7 @@ final class XRTSParser extends HandlerBa
* @param start the start position in the character array.
* @param length the number of characters to use from the character array.
*/
+ @Override
public void characters(char[] cbuf, int start, int len) throws SAXException
{
if (_nestingLevel == 2)
@@ -200,7 +203,7 @@ final class XRTSParser extends HandlerBa
private Set<String> _uniqKeys = new HashSet<String>();
private RTSWriter _bundleWriter;
- private Map _parms;
+ private Map<String, ?> _parms;
private int _nestingLevel = 0;
private boolean _startDoc = false;