sbailliez 02/02/24 04:12:45
Modified: src/java/org/apache/maven/importscrubber/format
AbstractStatementFormat.java
BreakForEachPackage.java BreakForTopPackage.java
IStatementFormat.java NoBreaks.java
StatementFormatFactory.java
Log:
Apply Turbine coding style
Revision Changes Path
1.3 +17 -14
jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/format/AbstractStatementFormat.java
Index: AbstractStatementFormat.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/format/AbstractStatementFormat.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractStatementFormat.java 21 Feb 2002 14:00:17 -0000 1.2
+++ AbstractStatementFormat.java 24 Feb 2002 12:12:45 -0000 1.3
@@ -54,24 +54,27 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
+import java.util.ResourceBundle;
+
public abstract class AbstractStatementFormat
{
- protected boolean _sortJavaLibsHigh;
+ protected boolean _sortJavaLibsHigh;
+
+ public boolean sortJavaLibsHigh()
+ {
+ return _sortJavaLibsHigh;
+ }
- public boolean sortJavaLibsHigh()
- {
- return _sortJavaLibsHigh;
- }
- public void sortJavaLibsHigh(boolean sortJavaLibsHigh)
- {
- _sortJavaLibsHigh = sortJavaLibsHigh;
- }
+ public void sortJavaLibsHigh(boolean sortJavaLibsHigh)
+ {
+ _sortJavaLibsHigh = sortJavaLibsHigh;
+ }
- public String toString(String name) {
- ResourceBundle res =
ResourceBundle.getBundle("org.apache.maven.importscrubber.Resources");
- return res.getString(name);
- }
+ public String toString(String name)
+ {
+ ResourceBundle res =
ResourceBundle.getBundle("org.apache.maven.importscrubber.Resources");
+ return res.getString(name);
+ }
}
1.3 +26 -22
jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/format/BreakForEachPackage.java
Index: BreakForEachPackage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/format/BreakForEachPackage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BreakForEachPackage.java 21 Feb 2002 14:00:17 -0000 1.2
+++ BreakForEachPackage.java 24 Feb 2002 12:12:45 -0000 1.3
@@ -54,29 +54,33 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-import org.apache.maven.importscrubber.*;
+import java.util.Iterator;
+
+import org.apache.maven.importscrubber.ImportScrubber;
+import org.apache.maven.importscrubber.ImportStatement;
+import org.apache.maven.importscrubber.Resources;
public class BreakForEachPackage extends AbstractStatementFormat implements
IStatementFormat
{
- public StringBuffer applyFormat(Iterator it)
- {
- StringBuffer result = new StringBuffer();
- ImportStatement last = null;
- while (it.hasNext())
- {
- ImportStatement next = (ImportStatement) it.next();
- if (last != null && !last.getPackage().equals(next.getPackage()))
- {
- result.append(ImportScrubber.LINE_SEPARATOR);
- }
- last = next;
- result.append(next.getFormattedStmt());
- }
- return result;
- }
-
- public String toString() {
- return super.toString(Resources.BREAK_EACH_PACKAGE);
- }
+ public StringBuffer applyFormat(Iterator it)
+ {
+ StringBuffer result = new StringBuffer();
+ ImportStatement last = null;
+ while (it.hasNext())
+ {
+ ImportStatement next = (ImportStatement) it.next();
+ if (last != null && !last.getPackage().equals(next.getPackage()))
+ {
+ result.append(ImportScrubber.LINE_SEPARATOR);
+ }
+ last = next;
+ result.append(next.getFormattedStmt());
+ }
+ return result;
+ }
+
+ public String toString()
+ {
+ return super.toString(Resources.BREAK_EACH_PACKAGE);
+ }
}
1.3 +25 -21
jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/format/BreakForTopPackage.java
Index: BreakForTopPackage.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/format/BreakForTopPackage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BreakForTopPackage.java 21 Feb 2002 14:00:17 -0000 1.2
+++ BreakForTopPackage.java 24 Feb 2002 12:12:45 -0000 1.3
@@ -54,30 +54,34 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-import org.apache.maven.importscrubber.*;
+import java.util.Iterator;
+
+import org.apache.maven.importscrubber.ImportScrubber;
+import org.apache.maven.importscrubber.ImportStatement;
+import org.apache.maven.importscrubber.Resources;
public class BreakForTopPackage extends AbstractStatementFormat implements
IStatementFormat
{
- public StringBuffer applyFormat(Iterator it)
- {
- StringBuffer result = new StringBuffer();
- ImportStatement last = null;
- while (it.hasNext())
- {
- ImportStatement next = (ImportStatement) it.next();
- if (last != null && !last.getPackage().equals(next.getPackage()))
- {
- result.append(ImportScrubber.LINE_SEPARATOR);
- }
- last = next;
- result.append(next.getFormattedStmt());
- }
- return result;
- }
+ public StringBuffer applyFormat(Iterator it)
+ {
+ StringBuffer result = new StringBuffer();
+ ImportStatement last = null;
+ while (it.hasNext())
+ {
+ ImportStatement next = (ImportStatement) it.next();
+ if (last != null && !last.getPackage().equals(next.getPackage()))
+ {
+ result.append(ImportScrubber.LINE_SEPARATOR);
+ }
+ last = next;
+ result.append(next.getFormattedStmt());
+ }
+ return result;
+ }
- public String toString() {
- return super.toString(Resources.BREAK_TOP_PACKAGE);
- }
+ public String toString()
+ {
+ return super.toString(Resources.BREAK_TOP_PACKAGE);
+ }
}
1.3 +5 -3
jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/format/IStatementFormat.java
Index: IStatementFormat.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/format/IStatementFormat.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IStatementFormat.java 21 Feb 2002 14:00:17 -0000 1.2
+++ IStatementFormat.java 24 Feb 2002 12:12:45 -0000 1.3
@@ -58,7 +58,9 @@
public interface IStatementFormat
{
- public StringBuffer applyFormat(Iterator it);
- public boolean sortJavaLibsHigh();
- public void sortJavaLibsHigh(boolean sortJavaLibsHigh);
+ public StringBuffer applyFormat(Iterator it);
+
+ public boolean sortJavaLibsHigh();
+
+ public void sortJavaLibsHigh(boolean sortJavaLibsHigh);
}
1.3 +17 -14
jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/format/NoBreaks.java
Index: NoBreaks.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/format/NoBreaks.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NoBreaks.java 21 Feb 2002 14:00:17 -0000 1.2
+++ NoBreaks.java 24 Feb 2002 12:12:45 -0000 1.3
@@ -54,22 +54,25 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-import org.apache.maven.importscrubber.*;
+import java.util.Iterator;
+
+import org.apache.maven.importscrubber.ImportStatement;
+import org.apache.maven.importscrubber.Resources;
public class NoBreaks extends AbstractStatementFormat implements IStatementFormat
{
- public StringBuffer applyFormat(Iterator it)
- {
- StringBuffer result = new StringBuffer();
- while (it.hasNext())
- {
- result.append(((ImportStatement) it.next()).getFormattedStmt());
- }
- return result;
- }
+ public StringBuffer applyFormat(Iterator it)
+ {
+ StringBuffer result = new StringBuffer();
+ while (it.hasNext())
+ {
+ result.append(((ImportStatement) it.next()).getFormattedStmt());
+ }
+ return result;
+ }
- public String toString() {
- return super.toString(Resources.BREAK_NONE);
- }
+ public String toString()
+ {
+ return super.toString(Resources.BREAK_NONE);
+ }
}
1.3 +56 -52
jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/format/StatementFormatFactory.java
Index: StatementFormatFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/importscrubber/format/StatementFormatFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StatementFormatFactory.java 21 Feb 2002 14:00:17 -0000 1.2
+++ StatementFormatFactory.java 24 Feb 2002 12:12:45 -0000 1.3
@@ -60,61 +60,65 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
public class StatementFormatFactory
{
- public static final String BREAK_FOR_EACH_PACKAGE = "each";
- public static final String BREAK_FOR_TOP_PACKAGE = "top";
- public static final String NO_BREAKS = "nobreaks";
- public static final String DEFAULT = NO_BREAKS;
-
- private HashMap _formats;
- private List _formatsList;
- private static StatementFormatFactory _singleton;
-
- private StatementFormatFactory() {
- _formats = new HashMap();
- _formats.put(BREAK_FOR_EACH_PACKAGE, new BreakForEachPackage());
- _formats.put(BREAK_FOR_TOP_PACKAGE, new BreakForTopPackage());
- _formats.put(NO_BREAKS, new NoBreaks());
-
- _formatsList = new ArrayList();
- _formatsList.add(_formats.get(BREAK_FOR_EACH_PACKAGE));
- _formatsList.add(_formats.get(BREAK_FOR_TOP_PACKAGE));
- _formatsList.add(_formats.get(NO_BREAKS));
- }
-
- public static StatementFormatFactory getInstance() {
- if (_singleton == null) {
- _singleton = new StatementFormatFactory();
- }
- return _singleton;
- }
-
- public IStatementFormat createStatementFormat(String id)
- {
- if (!_formats.containsKey(id))
- {
- System.out.println("Format " + id + " not found! Available formats:");
- for (Iterator keys = _formats.keySet().iterator(); keys.hasNext();)
- {
- String key = (String)keys.next();
- System.out.println(key);
- }
- throw new IllegalArgumentException("Format " + id + " not found!
Available formats:");
- }
-
- return (IStatementFormat)_formats.get(id);
- }
-
- public Map getFormatsMap() {
- return Collections.unmodifiableMap(_formats);
- }
-
- public List getFormatsList() {
- return Collections.unmodifiableList(_formatsList);
- }
+ public static final String BREAK_FOR_EACH_PACKAGE = "each";
+ public static final String BREAK_FOR_TOP_PACKAGE = "top";
+ public static final String NO_BREAKS = "nobreaks";
+ public static final String DEFAULT = NO_BREAKS;
+
+ private HashMap _formats;
+ private List _formatsList;
+ private static StatementFormatFactory _singleton;
+
+ private StatementFormatFactory()
+ {
+ _formats = new HashMap();
+ _formats.put(BREAK_FOR_EACH_PACKAGE, new BreakForEachPackage());
+ _formats.put(BREAK_FOR_TOP_PACKAGE, new BreakForTopPackage());
+ _formats.put(NO_BREAKS, new NoBreaks());
+
+ _formatsList = new ArrayList();
+ _formatsList.add(_formats.get(BREAK_FOR_EACH_PACKAGE));
+ _formatsList.add(_formats.get(BREAK_FOR_TOP_PACKAGE));
+ _formatsList.add(_formats.get(NO_BREAKS));
+ }
+
+ public static StatementFormatFactory getInstance()
+ {
+ if (_singleton == null)
+ {
+ _singleton = new StatementFormatFactory();
+ }
+ return _singleton;
+ }
+
+ public IStatementFormat createStatementFormat(String id)
+ {
+ if (!_formats.containsKey(id))
+ {
+ System.out.println("Format " + id + " not found! Available formats:");
+ for (Iterator keys = _formats.keySet().iterator(); keys.hasNext();)
+ {
+ String key = (String) keys.next();
+ System.out.println(key);
+ }
+ throw new IllegalArgumentException("Format " + id + " not found!
Available formats:");
+ }
+
+ return (IStatementFormat) _formats.get(id);
+ }
+
+ public Map getFormatsMap()
+ {
+ return Collections.unmodifiableMap(_formats);
+ }
+
+ public List getFormatsList()
+ {
+ return Collections.unmodifiableList(_formatsList);
+ }
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
