make casting unnecessary when calling WikiEngine#getAttribute()
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
index 4a82ada..6333552 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
@@ -1832,9 +1832,8 @@
* @param key the attribute name
* @return the value
*/
- public Object getAttribute( final String key )
- {
- return m_attributes.get( key );
+ public <T> T getAttribute( final String key ) {
+ return (T)m_attributes.get( key );
}
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
index 9e548b5..b23608a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
@@ -177,16 +177,11 @@
{
initInlineImagePatterns();
- m_camelCasePattern = (Pattern) m_engine.getAttribute( CAMELCASE_PATTERN );
- if( m_camelCasePattern == null )
- {
- try
- {
- m_camelCasePattern = m_compiler.compile( WIKIWORD_REGEX,
- Perl5Compiler.DEFAULT_MASK|Perl5Compiler.READ_ONLY_MASK );
- }
- catch( MalformedPatternException e )
- {
+ m_camelCasePattern = m_engine.getAttribute( CAMELCASE_PATTERN );
+ if( m_camelCasePattern == null ) {
+ try {
+ m_camelCasePattern = m_compiler.compile( WIKIWORD_REGEX,Perl5Compiler.DEFAULT_MASK|Perl5Compiler.READ_ONLY_MASK );
+ } catch( final MalformedPatternException e ) {
log.fatal("Internal error: Someone put in a faulty pattern.",e);
throw new InternalWikiException("Faulty camelcasepattern in TranslatorReader", e);
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/parser/MarkupParser.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/MarkupParser.java
index 56825a6..96a0b56 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/parser/MarkupParser.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/MarkupParser.java
@@ -18,16 +18,6 @@
*/
package org.apache.wiki.parser;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PushbackReader;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.log4j.Logger;
import org.apache.oro.text.GlobCompiler;
import org.apache.oro.text.regex.MalformedPatternException;
@@ -38,6 +28,16 @@
import org.apache.wiki.WikiEngine;
import org.jdom2.Element;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PushbackReader;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
/**
* Provides an abstract class for the parser instances.
*
@@ -281,7 +281,7 @@
//
// We cache compiled patterns in the engine, since their creation is really expensive
//
- List< Pattern > compiledpatterns = ( List< Pattern > )m_engine.getAttribute( INLINE_IMAGE_PATTERNS );
+ List< Pattern > compiledpatterns = m_engine.getAttribute( INLINE_IMAGE_PATTERNS );
if( compiledpatterns == null ) {
compiledpatterns = new ArrayList< >( 20 );
