Author: juanpablo
Date: Mon Jan 28 19:05:17 2013
New Revision: 1439574
URL: http://svn.apache.org/viewvc?rev=1439574&view=rev
Log:
deprecated JSPWikiMarkupParser.getImagePatterns( WikiEngine ) in favour of
WikiEngine.getAllInlinedImagePatterns()
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java
incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java?rev=1439574&r1=1439573&r2=1439574&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java Mon Jan 28
19:05:17 2013
@@ -50,7 +50,6 @@ import org.apache.wiki.content.PageRenam
import org.apache.wiki.diff.DifferenceManager;
import org.apache.wiki.event.*;
import org.apache.wiki.i18n.InternationalizationManager;
-import org.apache.wiki.parser.JSPWikiMarkupParser;
import org.apache.wiki.parser.MarkupParser;
import org.apache.wiki.parser.WikiDocument;
import org.apache.wiki.providers.ProviderException;
@@ -99,9 +98,15 @@ public class WikiEngine
/** Stores properties. */
private Properties m_properties;
+
+ /** The default inlining pattern. Currently "*.png" */
+ public static final String DEFAULT_INLINEPATTERN = "*.png";
/** Property for application name */
- public static final String PROP_APPNAME = "jspwiki.applicationName";
+ public static final String PROP_APPNAME = "jspwiki.applicationName";
+
+ /** This property defines the inline image pattern. It's current value is
{@value} */
+ public static final String PROP_INLINEIMAGEPTRN =
"jspwiki.translatorReader.inlinePattern";
/** Property start for any interwiki reference. */
public static final String PROP_INTERWIKIREF = "jspwiki.interWikiRef.";
@@ -1041,10 +1046,29 @@ public class WikiEngine
*
* @return A Collection of Strings with a regexp pattern.
*/
-
- public Collection getAllInlinedImagePatterns()
+ public Collection< String > getAllInlinedImagePatterns()
{
- return JSPWikiMarkupParser.getImagePatterns( this );
+ Properties props = getWikiProperties();
+ ArrayList<String> ptrnlist = new ArrayList<String>();
+
+ for( Enumeration e = props.propertyNames(); e.hasMoreElements(); )
+ {
+ String name = (String) e.nextElement();
+
+ if( name.startsWith( PROP_INLINEIMAGEPTRN ) )
+ {
+ String ptrn = TextUtil.getStringProperty( props, name, null );
+
+ ptrnlist.add( ptrn );
+ }
+ }
+
+ if( ptrnlist.size() == 0 )
+ {
+ ptrnlist.add( DEFAULT_INLINEPATTERN );
+ }
+
+ return ptrnlist;
}
/**
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java?rev=1439574&r1=1439573&r2=1439574&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java
Mon Jan 28 19:05:17 2013
@@ -123,7 +123,10 @@ public class JSPWikiMarkupParser
/**
* This property defines the inline image pattern. It's current value
* is jspwiki.translatorReader.inlinePattern
+ * @deprecated will be removed in 2.10 scope.
+ * Consider using {@link WikiEngine#PROP_INLINEIMAGEPTRN} instead
*/
+ @Deprecated
public static final String PROP_INLINEIMAGEPTRN =
"jspwiki.translatorReader.inlinePattern";
/** If true, consider CamelCase hyperlinks as well. */
@@ -175,7 +178,10 @@ public class JSPWikiMarkupParser
/**
* The default inlining pattern. Currently "*.png"
+ * @deprecated will be removed in 2.10 scope.
+ * Consider using {@link WikiEngine#DEFAULT_INLINEPATTERN} instead
*/
+ @Deprecated
public static final String DEFAULT_INLINEPATTERN = "*.png";
/**
@@ -263,17 +269,17 @@ public class JSPWikiMarkupParser
if( compiledpatterns == null )
{
compiledpatterns = new ArrayList<Pattern>(20);
- Collection ptrns = getImagePatterns( m_engine );
+ Collection< String > ptrns = m_engine.getAllInlinedImagePatterns();
//
// Make them into Regexp Patterns. Unknown patterns
// are ignored.
//
- for( Iterator i = ptrns.iterator(); i.hasNext(); )
+ for( Iterator< String > i = ptrns.iterator(); i.hasNext(); )
{
try
{
- compiledpatterns.add( compiler.compile( (String)i.next(),
+ compiledpatterns.add( compiler.compile( i.next(),
GlobCompiler.DEFAULT_MASK|GlobCompiler.READ_ONLY_MASK ) );
}
catch( MalformedPatternException e )
@@ -389,32 +395,13 @@ public class JSPWikiMarkupParser
* @return Collection of Strings with patterns.
*
* @param engine The WikiEngine from which the patterns are read.
+ * @deprecated will be removed in 2.10 scope.
+ * Consider using {@link WikiEngine#getAllInlinedImagePatterns()} instead
*/
-
- // FIXME: Does not belong here; should be elsewhere
+ @Deprecated
public static Collection getImagePatterns( WikiEngine engine )
{
- Properties props = engine.getWikiProperties();
- ArrayList<String> ptrnlist = new ArrayList<String>();
-
- for( Enumeration e = props.propertyNames(); e.hasMoreElements(); )
- {
- String name = (String) e.nextElement();
-
- if( name.startsWith( PROP_INLINEIMAGEPTRN ) )
- {
- String ptrn = TextUtil.getStringProperty( props, name, null );
-
- ptrnlist.add( ptrn );
- }
- }
-
- if( ptrnlist.size() == 0 )
- {
- ptrnlist.add( DEFAULT_INLINEPATTERN );
- }
-
- return ptrnlist;
+ return engine.getAllInlinedImagePatterns();
}
/**
