SHL-44 - Diagonalize DSM matrix

src/main/java/org/springframework/roo/shell/AbstractShell.java

@@ -22,6 +22,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.springframework.roo.shell.event.AbstractShellStatusPublisher;
+import org.springframework.roo.shell.event.ParseResult;
 import org.springframework.roo.shell.event.ShellStatus;
 import org.springframework.roo.shell.event.ShellStatus.Status;
 import org.springframework.roo.support.logging.HandlerUtils;

src/main/java/org/springframework/roo/shell/ExecutionStrategy.java

@@ -1,5 +1,7 @@
 package org.springframework.roo.shell;
 
+import org.springframework.roo.shell.event.ParseResult;
+
 /**
  * Strategy interface to permit the controlled execution of methods.
  *

src/main/java/org/springframework/roo/shell/Parser.java

@@ -2,6 +2,8 @@ package org.springframework.roo.shell;
 
 import java.util.List;
 
+import org.springframework.roo.shell.event.ParseResult;
+
 /**
  * Interface for {@link SimpleParser}.
  *

src/main/java/org/springframework/roo/shell/SimpleParser.java

@@ -28,6 +28,7 @@ import java.util.regex.Pattern;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.transform.Transformer;
 
+import org.springframework.roo.shell.event.ParseResult;
 import org.springframework.roo.support.logging.HandlerUtils;
 import org.springframework.roo.support.util.Assert;
 import org.springframework.roo.support.util.CollectionUtils;

src/main/java/org/springframework/roo/shell/event/AbstractShellStatusPublisher.java

@@ -3,7 +3,6 @@ package org.springframework.roo.shell.event;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import org.springframework.roo.shell.ParseResult;
 import org.springframework.roo.shell.event.ShellStatus.Status;
 import org.springframework.roo.support.util.Assert;
 

src/main/java/org/springframework/roo/shell/event/ParseResult.java

@@ -1,8 +1,9 @@
-package org.springframework.roo.shell;
+package org.springframework.roo.shell.event;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
 
+import org.springframework.roo.shell.Converter;
 import org.springframework.roo.support.style.ToStringCreator;
 import org.springframework.roo.support.util.Assert;
 import org.springframework.roo.support.util.StringUtils;

src/main/java/org/springframework/roo/shell/event/ShellStatus.java

@@ -1,6 +1,5 @@
 package org.springframework.roo.shell.event;
 
-import org.springframework.roo.shell.ParseResult;
 
 /**
  * Represents the different states that a shell can legally be in.

src/main/java/org/springframework/roo/support/logging/MessageDisplayUtils.java

@@ -1,4 +1,4 @@
-package org.springframework.roo.support.util;
+package org.springframework.roo.support.logging;
 
 import java.io.BufferedInputStream;
 import java.io.InputStream;
@@ -6,7 +6,8 @@ import java.io.InputStreamReader;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.springframework.roo.support.logging.HandlerUtils;
+import org.springframework.roo.support.util.FileCopyUtils;
+import org.springframework.roo.support.util.IOUtils;
 
 /**
  * Retrieves text files from the classloader and displays them on-screen.

src/main/java/org/springframework/roo/support/util/AntPatchStringMatcher.java

@@ -1,4 +1,4 @@
-package org.springframework.roo.support.ant;
+package org.springframework.roo.support.util;
 
 import java.util.Map;
 

src/main/java/org/springframework/roo/support/util/AntPathMatcher.java

@@ -1,10 +1,8 @@
-package org.springframework.roo.support.ant;
+package org.springframework.roo.support.util;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.springframework.roo.support.util.Assert;
-import org.springframework.roo.support.util.StringUtils;
 
 /**
  * PathMatcher implementation for Ant-style path patterns.

src/main/java/org/springframework/roo/support/util/FileUtils.java

@@ -9,8 +9,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.regex.Pattern;
 
-import org.springframework.roo.support.ant.AntPathMatcher;
-import org.springframework.roo.support.ant.PathMatcher;
 
 /**
  * Utilities for handling {@link File} instances.

src/main/java/org/springframework/roo/support/util/PathMatcher.java

@@ -1,4 +1,4 @@
-package org.springframework.roo.support.ant;
+package org.springframework.roo.support.util;
 
 import java.util.Map;
 

src/main/java/org/springframework/shell/ExecutionProcessor.java

@@ -16,7 +16,7 @@
 package org.springframework.shell;
 
 import org.springframework.roo.shell.CommandMarker;
-import org.springframework.roo.shell.ParseResult;
+import org.springframework.roo.shell.event.ParseResult;
 
 /**
  * Extension interface allowing command provider to be called

src/main/java/org/springframework/shell/SimpleExecutionStrategy.java

@@ -2,7 +2,7 @@ package org.springframework.shell;
 
 import org.springframework.roo.shell.CommandMarker;
 import org.springframework.roo.shell.ExecutionStrategy;
-import org.springframework.roo.shell.ParseResult;
+import org.springframework.roo.shell.event.ParseResult;
 import org.springframework.roo.support.util.Assert;
 import org.springframework.roo.support.util.ReflectionUtils;
 

src/test/java/org/springframework/shell/SimpleExecutionStrategyTest.java

@@ -18,7 +18,7 @@ package org.springframework.shell;
 import java.lang.reflect.Method;
 
 import org.junit.Test;
-import org.springframework.roo.shell.ParseResult;
+import org.springframework.roo.shell.event.ParseResult;
 import org.springframework.util.ReflectionUtils;
 
 import static org.junit.Assert.*;