diff --git a/README.md b/README.md index b6e1f95..4093eca 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ TravisCI: [![Build Status](https://travis-ci.org/jimbethancourt/dtangler.svg?branch=master)](https://travis-ci.org/jimbethancourt/dtangler) -SonarCloud: [![Quality Gate](https://sonarcloud.io/api/badges/gate?key=org.dtangler%3Adtangler)](https://sonarcloud.io/dashboard?id=org.dtangler%3Adtangler) +SonarCloud: [![Quality Gate](https://sonarcloud.io/api/badges/gate?key=org.hjug.dtangler%3Adtangler)](https://sonarcloud.io/dashboard?id=org.hjug.dtangler%3Adtangler) [![CodeFactor](https://www.codefactor.io/repository/github/jimbethancourt/dtangler/badge)](https://www.codefactor.io/repository/github/jimbethancourt/dtangler) diff --git a/Rake_incremental_java_build.rb b/Rake_incremental_java_build.rb index 86454e4..308b082 100644 --- a/Rake_incremental_java_build.rb +++ b/Rake_incremental_java_build.rb @@ -2,22 +2,22 @@ # An incremental java build systme using Rake. # See dtangler Rakefile for usage example. ##################################################################################################### - -require "ftools" - -def env_or_default(env_var, default_value) + +require "ftools" + +def env_or_default(env_var, default_value) result = ENV[env_var] result = default_value if result.nil? raise "#{env_var} not set" if result.nil? - puts "#{env_var} = #{result}" + puts "#{env_var} = #{result}" return result -end - -# no default, JAVA_HOME must be set -JAVA_HOME = env_or_default("JAVA_HOME", nil) -JAVABIN = "#{JAVA_HOME}/bin" - -BUILD_FOLDER = env_or_default("BUILDDIR", "_build") +end + +# no default, JAVA_HOME must be set +JAVA_HOME = env_or_default("JAVA_HOME", nil) +JAVABIN = "#{JAVA_HOME}/bin" + +BUILD_FOLDER = env_or_default("BUILDDIR", "_build") # Windowland uses ';' Unixland uses ':', workaround: PATH_SEPARATOR = (File.exist?('C:\\') ? ';' : ':'); @@ -46,8 +46,8 @@ def compile_java(src_folder, classes_folder, class_path) compile_class_path = class_path.join(PATH_SEPARATOR) cp_arg = '' cp_arg = "-cp #{compile_class_path}" if(class_path.size > 0) - - options = '-Xlint:-unchecked' + + options = '-Xlint:-unchecked' FileList["#{src_folder}/**/*"].exclude("#{src_folder}/**/*.java").each {|source| dest = source.sub(src_folder,classes_folder) @@ -92,7 +92,7 @@ def run_junit(project_name, classpath, successfile, junit_cmd) test_class_path = classpath.join(PATH_SEPARATOR) puts "Running junit tests for #{project_name}" - + java_cmd_line = "#{JAVABIN}/java -cp #{test_class_path} #{junit_cmd}" sh java_cmd_line do |ok, res| if(ok) @@ -200,24 +200,24 @@ def create_rake_tasks # tests compilation unit: 'test' <-- 'classes-test' # class Project < Buildable - - attr_accessor :prod, :testutil, :test + + attr_accessor :prod, :testutil, :test attr_writer :junit_cmd - + def initialize(name) super(name) @prod = CompilationUnit.new(@name, 'src') @testutil = CompilationUnit.new(@name, 'testutil') @test = CompilationUnit.new(@name, 'test') @testutil.depends_on(@prod) - @test.depends_on(@testutil) + @test.depends_on(@testutil) @junit_cmd = build_default_junit_cmd(name) - end - - def build_default_junit_cmd(name) + end + + def build_default_junit_cmd(name) project_id = name.split('-')[1] - testclassprefix = "org.dtangler.#{project_id}" - return "-DclasspathSuitePrefix=#{testclassprefix} org.junit.runner.JUnitCore org.dtangler.testcollectorrunner.ClassPathTestSuite" + testclassprefix = "org.hjug.dtangler.#{project_id}" + return "-DclasspathSuitePrefix=#{testclassprefix} org.junit.runner.JUnitCore org.hjug.dtangler.testcollectorrunner.ClassPathTestSuite" end def depends_on(other_project) @@ -227,7 +227,7 @@ def depends_on(other_project) def tests_depend_on(other_project) @test.depends_on(other_project.test) - @testutil.depends_on(other_project.testutil) # utils may build upon others utils + @testutil.depends_on(other_project.testutil) # utils may build upon others utils end def jar @@ -241,9 +241,9 @@ def test_success def create_rake_tasks puts "Creating rake tasks for JavaProject #{@name}" - file test_success => @test.classes_folder do + file test_success => @test.classes_folder do run_junit(@name, @test.classpath, test_success, @junit_cmd) - end + end @prod.create_rake_tasks @testutil.create_rake_tasks @@ -251,4 +251,4 @@ def create_rake_tasks end end - + diff --git a/Rakefile b/Rakefile index 632e779..4b909f8 100644 --- a/Rakefile +++ b/Rakefile @@ -17,15 +17,15 @@ ##################################################################################################### require "Rake_incremental_java_build.rb" - -RELEASE_FOLDER = env_or_default("RELEASEDIR", "_release") - - - + +RELEASE_FOLDER = env_or_default("RELEASEDIR", "_release") + + + ##################################################################################################### # Create a DSM text file with dtangler ##################################################################################################### -def create_dsm(core_jar, input, outputFile) +def create_dsm(core_jar, input, outputFile) puts "Running dtangler on #{input}" java_cmd_line = "#{JAVABIN}/java -jar #{core_jar} -input=#{input} > #{outputFile}" sh java_cmd_line do |ok, res| @@ -33,8 +33,8 @@ def create_dsm(core_jar, input, outputFile) raise "DEPENDENCY CHECK FAILED: There are cycles or illegal dependencies. See #{outputFile}." end end -end - +end + ##################################################################################################### # Define subprojects and their dependencies @@ -61,24 +61,24 @@ end swingui.depends_on forms swingui.tests_depend_on uispec4j swingui.tests_depend_on junit - swingui.tests_depend_on bumblebee - swingui.tests_depend_on bumblebee + swingui.tests_depend_on bumblebee + swingui.tests_depend_on bumblebee testsuites = Project.new "dtangler-testsuites" testsuites.test.depends_on core.test testsuites.test.depends_on ui.test testsuites.test.depends_on swingui.test testsuites.tests_depend_on bumblebee - testsuites.junit_cmd = "-Ddtangler-root=. org.junit.runner.JUnitCore org.dtangler.testsuites.docsuites.Dtangler" + testsuites.junit_cmd = "-Ddtangler-root=. org.junit.runner.JUnitCore org.hjug.dtangler.testsuites.docsuites.Dtangler" + - - # Define the files for release - core_jar = "#{RELEASE_FOLDER}/dtangler-core.jar" - gui_jar = "#{RELEASE_FOLDER}/dtangler-gui.jar" - core_dsm = "#{RELEASE_FOLDER}/dtangler-core-dsm.txt" - gui_dsm = "#{RELEASE_FOLDER}/dtangler-gui-dsm.txt" - - documentation_success = "#{BUILD_FOLDER}/documentation_success" + # Define the files for release + core_jar = "#{RELEASE_FOLDER}/dtangler-core.jar" + gui_jar = "#{RELEASE_FOLDER}/dtangler-gui.jar" + core_dsm = "#{RELEASE_FOLDER}/dtangler-core-dsm.txt" + gui_dsm = "#{RELEASE_FOLDER}/dtangler-gui-dsm.txt" + + documentation_success = "#{BUILD_FOLDER}/documentation_success" # Publish rake targets Buildable.init_rake_tasks @@ -90,18 +90,18 @@ end file gui_jar => [core.test_success, ui.test_success, swingui.test_success] do create_jar(gui_jar, "dtangler-swingui/MANIFEST.MF", [core.prod.classes_folder, ui.prod.classes_folder, swingui.prod.classes_folder]) end - + # Documentation is generated while running the tests in the testsuites-project - task :documentation => [testsuites.test_success] - - file core_dsm => [core_jar] do - create_dsm(core_jar, core_jar, core_dsm) + task :documentation => [testsuites.test_success] + + file core_dsm => [core_jar] do + create_dsm(core_jar, core_jar, core_dsm) end - - file gui_dsm => [core_jar, gui_jar] do - create_dsm(core_jar, gui_jar, gui_dsm) + + file gui_dsm => [core_jar, gui_jar] do + create_dsm(core_jar, gui_jar, gui_dsm) end task :default => [core_jar, gui_jar, core_dsm, gui_dsm, :documentation] - + diff --git a/dtangler-core/MANIFEST.MF b/dtangler-core/MANIFEST.MF index e761c51..16cc11b 100644 --- a/dtangler-core/MANIFEST.MF +++ b/dtangler-core/MANIFEST.MF @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -Main-Class: org.dtangler.core.Main +Main-Class: org.hjug.dtangler.core.Main diff --git a/dtangler-core/src/main/java/org/dtangler/core/CommandLineApp.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/CommandLineApp.java similarity index 66% rename from dtangler-core/src/main/java/org/dtangler/core/CommandLineApp.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/CommandLineApp.java index 5e7ccc9..0229422 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/CommandLineApp.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/CommandLineApp.java @@ -3,20 +3,20 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core; +package org.hjug.dtangler.core; -import org.dtangler.core.analysis.configurableanalyzer.ConfigurableDependencyAnalyzer; -import org.dtangler.core.analysisresult.AnalysisResult; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.DependencyGraph; -import org.dtangler.core.dependencyengine.DependencyEngine; -import org.dtangler.core.dependencyengine.DependencyEngineFactory; -import org.dtangler.core.dsmengine.DsmEngine; -import org.dtangler.core.input.ArgumentBuilder; -import org.dtangler.core.textui.DSMWriter; -import org.dtangler.core.textui.ViolationWriter; -import org.dtangler.core.textui.Writer; +import org.hjug.dtangler.core.analysis.configurableanalyzer.ConfigurableDependencyAnalyzer; +import org.hjug.dtangler.core.analysisresult.AnalysisResult; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.core.dependencyengine.DependencyEngine; +import org.hjug.dtangler.core.dependencyengine.DependencyEngineFactory; +import org.hjug.dtangler.core.dsmengine.DsmEngine; +import org.hjug.dtangler.core.input.ArgumentBuilder; +import org.hjug.dtangler.core.textui.DSMWriter; +import org.hjug.dtangler.core.textui.ViolationWriter; +import org.hjug.dtangler.core.textui.Writer; public class CommandLineApp { diff --git a/dtangler-core/src/main/java/org/dtangler/core/HelpText.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/HelpText.java similarity index 96% rename from dtangler-core/src/main/java/org/dtangler/core/HelpText.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/HelpText.java index d75ad73..f66f480 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/HelpText.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/HelpText.java @@ -3,10 +3,10 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core; +package org.hjug.dtangler.core; -import org.dtangler.core.configuration.ParserConstants; -import org.dtangler.core.input.CommandLineParser; +import org.hjug.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.input.CommandLineParser; public class HelpText { diff --git a/dtangler-core/src/main/java/org/dtangler/core/Main.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/Main.java similarity index 87% rename from dtangler-core/src/main/java/org/dtangler/core/Main.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/Main.java index 7ffdb06..a819591 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/Main.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/Main.java @@ -3,13 +3,13 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core; +package org.hjug.dtangler.core; import java.io.PrintStream; -import org.dtangler.core.exception.DtException; -import org.dtangler.core.textui.SysoutWriter; -import org.dtangler.core.versioninfo.VersionInfo; +import org.hjug.dtangler.core.exception.DtException; +import org.hjug.dtangler.core.textui.SysoutWriter; +import org.hjug.dtangler.core.versioninfo.VersionInfo; public class Main { diff --git a/dtangler-core/src/main/java/org/dtangler/core/MissingArgumentsException.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/MissingArgumentsException.java similarity index 68% rename from dtangler-core/src/main/java/org/dtangler/core/MissingArgumentsException.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/MissingArgumentsException.java index ebdc1db..6bb4b77 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/MissingArgumentsException.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/MissingArgumentsException.java @@ -1,4 +1,4 @@ -package org.dtangler.core; +package org.hjug.dtangler.core; public class MissingArgumentsException extends RuntimeException { diff --git a/dtangler-core/src/main/java/org/dtangler/core/analysis/ChildViolation.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/analysis/ChildViolation.java similarity index 88% rename from dtangler-core/src/main/java/org/dtangler/core/analysis/ChildViolation.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/analysis/ChildViolation.java index 1db4348..ff55ba3 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/analysis/ChildViolation.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/analysis/ChildViolation.java @@ -3,12 +3,12 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.analysis; +package org.hjug.dtangler.core.analysis; import java.util.Set; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.dependencies.Dependable; public class ChildViolation implements Violation { diff --git a/dtangler-core/src/main/java/org/dtangler/core/analysis/ChildViolationFinder.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/analysis/ChildViolationFinder.java similarity index 92% rename from dtangler-core/src/main/java/org/dtangler/core/analysis/ChildViolationFinder.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/analysis/ChildViolationFinder.java index b2f8da2..4c4822d 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/analysis/ChildViolationFinder.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/analysis/ChildViolationFinder.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.analysis; +package org.hjug.dtangler.core.analysis; import java.util.Collections; import java.util.HashMap; @@ -11,10 +11,10 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Dependency; public class ChildViolationFinder { diff --git a/dtangler-core/src/main/java/org/dtangler/core/analysis/CompositeAnalyzer.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/analysis/CompositeAnalyzer.java similarity index 83% rename from dtangler-core/src/main/java/org/dtangler/core/analysis/CompositeAnalyzer.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/analysis/CompositeAnalyzer.java index 0491a56..a95daad 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/analysis/CompositeAnalyzer.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/analysis/CompositeAnalyzer.java @@ -3,16 +3,16 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.analysis; +package org.hjug.dtangler.core.analysis; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.Map.Entry; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Dependency; public class CompositeAnalyzer extends DependencyAnalyzer { diff --git a/dtangler-core/src/main/java/org/dtangler/core/analysis/DependencyAnalyzer.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/analysis/DependencyAnalyzer.java similarity index 85% rename from dtangler-core/src/main/java/org/dtangler/core/analysis/DependencyAnalyzer.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/analysis/DependencyAnalyzer.java index fc9f68b..a7648d9 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/analysis/DependencyAnalyzer.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/analysis/DependencyAnalyzer.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.analysis; +package org.hjug.dtangler.core.analysis; import java.util.Collection; import java.util.HashMap; @@ -11,10 +11,10 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Dependency; public abstract class DependencyAnalyzer { diff --git a/dtangler-core/src/main/java/org/dtangler/core/analysis/configurableanalyzer/ConfigurableDependencyAnalyzer.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/analysis/configurableanalyzer/ConfigurableDependencyAnalyzer.java similarity index 64% rename from dtangler-core/src/main/java/org/dtangler/core/analysis/configurableanalyzer/ConfigurableDependencyAnalyzer.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/analysis/configurableanalyzer/ConfigurableDependencyAnalyzer.java index 3dba17e..a3cf9b4 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/analysis/configurableanalyzer/ConfigurableDependencyAnalyzer.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/analysis/configurableanalyzer/ConfigurableDependencyAnalyzer.java @@ -3,16 +3,16 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.analysis.configurableanalyzer; +package org.hjug.dtangler.core.analysis.configurableanalyzer; -import org.dtangler.core.analysis.CompositeAnalyzer; -import org.dtangler.core.analysis.DependencyAnalyzer; -import org.dtangler.core.analysisresult.AnalysisResult; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.cycleanalysis.CycleValidator; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.ruleanalysis.ForbiddenDependencyFinder; -import org.dtangler.core.ruleanalysis.RuleCreator; +import org.hjug.dtangler.core.analysis.CompositeAnalyzer; +import org.hjug.dtangler.core.analysis.DependencyAnalyzer; +import org.hjug.dtangler.core.analysisresult.AnalysisResult; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.cycleanalysis.CycleValidator; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.ruleanalysis.ForbiddenDependencyFinder; +import org.hjug.dtangler.core.ruleanalysis.RuleCreator; public class ConfigurableDependencyAnalyzer { diff --git a/dtangler-core/src/main/java/org/dtangler/core/analysisresult/AnalysisResult.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/analysisresult/AnalysisResult.java similarity index 92% rename from dtangler-core/src/main/java/org/dtangler/core/analysisresult/AnalysisResult.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/analysisresult/AnalysisResult.java index c965670..e2c09b8 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/analysisresult/AnalysisResult.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/analysisresult/AnalysisResult.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.analysisresult; +package org.hjug.dtangler.core.analysisresult; import java.util.Collections; import java.util.HashMap; @@ -11,9 +11,9 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.analysisresult.Violation.Severity; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.analysisresult.Violation.Severity; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependency; public class AnalysisResult { diff --git a/dtangler-core/src/main/java/org/dtangler/core/analysisresult/Violation.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/analysisresult/Violation.java similarity index 82% rename from dtangler-core/src/main/java/org/dtangler/core/analysisresult/Violation.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/analysisresult/Violation.java index 86a94cc..4da416d 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/analysisresult/Violation.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/analysisresult/Violation.java @@ -3,11 +3,11 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.analysisresult; +package org.hjug.dtangler.core.analysisresult; import java.util.Set; -import org.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependable; public interface Violation { diff --git a/dtangler-core/src/main/java/org/dtangler/core/configuration/ParserConstants.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/configuration/ParserConstants.java similarity index 97% rename from dtangler-core/src/main/java/org/dtangler/core/configuration/ParserConstants.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/configuration/ParserConstants.java index 157544d..bc8398b 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/configuration/ParserConstants.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/configuration/ParserConstants.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.configuration; +package org.hjug.dtangler.core.configuration; public class ParserConstants { diff --git a/dtangler-core/src/main/java/org/dtangler/core/cycleanalysis/CycleValidator.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/cycleanalysis/CycleValidator.java similarity index 88% rename from dtangler-core/src/main/java/org/dtangler/core/cycleanalysis/CycleValidator.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/cycleanalysis/CycleValidator.java index 7b13d30..c5b583d 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/cycleanalysis/CycleValidator.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/cycleanalysis/CycleValidator.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.cycleanalysis; +package org.hjug.dtangler.core.cycleanalysis; import java.util.ArrayList; import java.util.Collections; @@ -11,13 +11,13 @@ import java.util.List; import java.util.Set; -import org.dtangler.core.analysis.DependencyAnalyzer; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Dependency; -import org.dtangler.core.dependencies.DependencyGraph; -import org.dtangler.core.dependencies.DependencyPath; -import org.dtangler.core.dependencies.Scope; +import org.hjug.dtangler.core.analysis.DependencyAnalyzer; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.core.dependencies.DependencyPath; +import org.hjug.dtangler.core.dependencies.Scope; public class CycleValidator extends DependencyAnalyzer { diff --git a/dtangler-core/src/main/java/org/dtangler/core/cycleanalysis/DependencyCycle.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/cycleanalysis/DependencyCycle.java similarity index 94% rename from dtangler-core/src/main/java/org/dtangler/core/cycleanalysis/DependencyCycle.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/cycleanalysis/DependencyCycle.java index 5c403dd..9d8041a 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/cycleanalysis/DependencyCycle.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/cycleanalysis/DependencyCycle.java @@ -3,15 +3,15 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.cycleanalysis; +package org.hjug.dtangler.core.cycleanalysis; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.dependencies.Dependable; public class DependencyCycle implements Violation { diff --git a/dtangler-core/src/main/java/org/dtangler/core/dependencies/DependencyPath.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/dependencies/DependencyPath.java similarity index 96% rename from dtangler-core/src/main/java/org/dtangler/core/dependencies/DependencyPath.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/dependencies/DependencyPath.java index bea57c3..65b28a2 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/dependencies/DependencyPath.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/dependencies/DependencyPath.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencies; +package org.hjug.dtangler.core.dependencies; import java.util.ArrayList; import java.util.List; diff --git a/dtangler-core/src/main/java/org/dtangler/core/dependencyengine/DependencyEngineConfigConstants.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/dependencyengine/DependencyEngineConfigConstants.java similarity index 86% rename from dtangler-core/src/main/java/org/dtangler/core/dependencyengine/DependencyEngineConfigConstants.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/dependencyengine/DependencyEngineConfigConstants.java index 56d8c83..9a8664c 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/dependencyengine/DependencyEngineConfigConstants.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/dependencyengine/DependencyEngineConfigConstants.java @@ -1,4 +1,4 @@ -package org.dtangler.core.dependencyengine; +package org.hjug.dtangler.core.dependencyengine; public class DependencyEngineConfigConstants { diff --git a/dtangler-core/src/main/java/org/dtangler/core/dependencyengine/DependencyEngineFactory.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/dependencyengine/DependencyEngineFactory.java similarity index 89% rename from dtangler-core/src/main/java/org/dtangler/core/dependencyengine/DependencyEngineFactory.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/dependencyengine/DependencyEngineFactory.java index bed1768..b0c6db1 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/dependencyengine/DependencyEngineFactory.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/dependencyengine/DependencyEngineFactory.java @@ -1,8 +1,8 @@ -package org.dtangler.core.dependencyengine; +package org.hjug.dtangler.core.dependencyengine; import java.util.List; -import org.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.Arguments; public class DependencyEngineFactory { diff --git a/dtangler-core/src/main/java/org/dtangler/core/dependencyengine/DependencyEnginePool.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/dependencyengine/DependencyEnginePool.java similarity index 97% rename from dtangler-core/src/main/java/org/dtangler/core/dependencyengine/DependencyEnginePool.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/dependencyengine/DependencyEnginePool.java index 59fde79..e5a5f4f 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/dependencyengine/DependencyEnginePool.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/dependencyengine/DependencyEnginePool.java @@ -1,4 +1,4 @@ -package org.dtangler.core.dependencyengine; +package org.hjug.dtangler.core.dependencyengine; import java.io.File; import java.io.FileFilter; @@ -17,16 +17,16 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.exception.DtException; -import org.dtangler.core.filefinder.RecursiveFileFinder; -import org.dtangler.core.input.ConfigFileParser; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.exception.DtException; +import org.hjug.dtangler.core.filefinder.RecursiveFileFinder; +import org.hjug.dtangler.core.input.ConfigFileParser; public class DependencyEnginePool { private final List dependencyEngines = new ArrayList<>(); - private final String packagenamePrefix = "org/dtangler"; + private final String packagenamePrefix = "org/hjug/dtangler"; private final String dependencyEngineConfigFilePrefix = "dependency-engine-"; private final String dependencyEngineConfigFileRegex = ".*" + dependencyEngineConfigFilePrefix + ".*\\.properties$"; diff --git a/dtangler-core/src/main/java/org/dtangler/core/dependencyengine/DependencyEnginePoolConfigConstants.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/dependencyengine/DependencyEnginePoolConfigConstants.java similarity index 82% rename from dtangler-core/src/main/java/org/dtangler/core/dependencyengine/DependencyEnginePoolConfigConstants.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/dependencyengine/DependencyEnginePoolConfigConstants.java index ce0095a..be5a5a4 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/dependencyengine/DependencyEnginePoolConfigConstants.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/dependencyengine/DependencyEnginePoolConfigConstants.java @@ -1,4 +1,4 @@ -package org.dtangler.core.dependencyengine; +package org.hjug.dtangler.core.dependencyengine; public class DependencyEnginePoolConfigConstants { diff --git a/dtangler-core/src/main/java/org/dtangler/core/dsm/Dsm.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/dsm/Dsm.java similarity index 91% rename from dtangler-core/src/main/java/org/dtangler/core/dsm/Dsm.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/dsm/Dsm.java index 5970285..d953e00 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/dsm/Dsm.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/dsm/Dsm.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dsm; +package org.hjug.dtangler.core.dsm; import java.util.List; diff --git a/dtangler-core/src/main/java/org/dtangler/core/dsm/DsmCell.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/dsm/DsmCell.java similarity index 83% rename from dtangler-core/src/main/java/org/dtangler/core/dsm/DsmCell.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/dsm/DsmCell.java index 70540df..b756a02 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/dsm/DsmCell.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/dsm/DsmCell.java @@ -3,10 +3,10 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dsm; +package org.hjug.dtangler.core.dsm; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependency; public class DsmCell { diff --git a/dtangler-core/src/main/java/org/dtangler/core/dsm/DsmRow.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/dsm/DsmRow.java similarity index 85% rename from dtangler-core/src/main/java/org/dtangler/core/dsm/DsmRow.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/dsm/DsmRow.java index 1fd3e6d..8455b92 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/dsm/DsmRow.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/dsm/DsmRow.java @@ -3,11 +3,11 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dsm; +package org.hjug.dtangler.core.dsm; import java.util.List; -import org.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependable; public class DsmRow { diff --git a/dtangler-core/src/main/java/org/dtangler/core/dsmengine/DsmEngine.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/dsmengine/DsmEngine.java similarity index 81% rename from dtangler-core/src/main/java/org/dtangler/core/dsmengine/DsmEngine.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/dsmengine/DsmEngine.java index 1e24d9d..1953724 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/dsmengine/DsmEngine.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/dsmengine/DsmEngine.java @@ -3,17 +3,17 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dsmengine; +package org.hjug.dtangler.core.dsmengine; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.DependencyGraph; -import org.dtangler.core.dsm.Dsm; -import org.dtangler.core.dsm.DsmCell; -import org.dtangler.core.dsm.DsmRow; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.core.dsm.Dsm; +import org.hjug.dtangler.core.dsm.DsmCell; +import org.hjug.dtangler.core.dsm.DsmRow; public class DsmEngine { diff --git a/dtangler-core/src/main/java/org/dtangler/core/dsmengine/InstabilityComparator.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/dsmengine/InstabilityComparator.java similarity index 88% rename from dtangler-core/src/main/java/org/dtangler/core/dsmengine/InstabilityComparator.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/dsmengine/InstabilityComparator.java index f0e6bca..0c0ab61 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/dsmengine/InstabilityComparator.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/dsmengine/InstabilityComparator.java @@ -3,12 +3,12 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dsmengine; +package org.hjug.dtangler.core.dsmengine; import java.util.Comparator; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.DependencyGraph; public class InstabilityComparator implements Comparator { diff --git a/dtangler-core/src/main/java/org/dtangler/core/filefinder/AlwaysValidFileFilter.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/filefinder/AlwaysValidFileFilter.java similarity index 89% rename from dtangler-core/src/main/java/org/dtangler/core/filefinder/AlwaysValidFileFilter.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/filefinder/AlwaysValidFileFilter.java index b069d2c..81cf849 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/filefinder/AlwaysValidFileFilter.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/filefinder/AlwaysValidFileFilter.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.filefinder; +package org.hjug.dtangler.core.filefinder; import java.io.File; import java.io.FileFilter; diff --git a/dtangler-core/src/main/java/org/dtangler/core/filefinder/FullPathWildCardFileFilter.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/filefinder/FullPathWildCardFileFilter.java similarity index 94% rename from dtangler-core/src/main/java/org/dtangler/core/filefinder/FullPathWildCardFileFilter.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/filefinder/FullPathWildCardFileFilter.java index 395ab15..c8e0c76 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/filefinder/FullPathWildCardFileFilter.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/filefinder/FullPathWildCardFileFilter.java @@ -3,13 +3,13 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.filefinder; +package org.hjug.dtangler.core.filefinder; import java.io.File; import java.io.FileFilter; import java.util.List; -import org.dtangler.core.util.WildcardMatch; +import org.hjug.dtangler.core.util.WildcardMatch; public class FullPathWildCardFileFilter implements FileFilter { diff --git a/dtangler-core/src/main/java/org/dtangler/core/filefinder/RecursiveFileFinder.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/filefinder/RecursiveFileFinder.java similarity index 96% rename from dtangler-core/src/main/java/org/dtangler/core/filefinder/RecursiveFileFinder.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/filefinder/RecursiveFileFinder.java index 327cc05..d9a686c 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/filefinder/RecursiveFileFinder.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/filefinder/RecursiveFileFinder.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.filefinder; +package org.hjug.dtangler.core.filefinder; import java.io.File; import java.io.FileFilter; diff --git a/dtangler-core/src/main/java/org/dtangler/core/input/ArgumentBuilder.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/input/ArgumentBuilder.java similarity index 85% rename from dtangler-core/src/main/java/org/dtangler/core/input/ArgumentBuilder.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/input/ArgumentBuilder.java index 048b903..4d77920 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/input/ArgumentBuilder.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/input/ArgumentBuilder.java @@ -3,13 +3,13 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.input; +package org.hjug.dtangler.core.input; import java.io.File; import java.util.Map; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.ParserConstants; public class ArgumentBuilder { public Arguments build(String[] cmdLineArgs) { diff --git a/dtangler-core/src/main/java/org/dtangler/core/input/ArgumentParser.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/input/ArgumentParser.java similarity index 96% rename from dtangler-core/src/main/java/org/dtangler/core/input/ArgumentParser.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/input/ArgumentParser.java index 6f5edbe..26fa67d 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/input/ArgumentParser.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/input/ArgumentParser.java @@ -3,13 +3,13 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.input; +package org.hjug.dtangler.core.input; import java.util.*; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.Group; -import org.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.core.configuration.ParserConstants; public class ArgumentParser { protected Arguments args = new Arguments(); diff --git a/dtangler-core/src/main/java/org/dtangler/core/input/CommandLineParser.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/input/CommandLineParser.java similarity index 97% rename from dtangler-core/src/main/java/org/dtangler/core/input/CommandLineParser.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/input/CommandLineParser.java index 745dfd8..b147982 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/input/CommandLineParser.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/input/CommandLineParser.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.input; +package org.hjug.dtangler.core.input; import java.util.ArrayList; import java.util.Arrays; diff --git a/dtangler-core/src/main/java/org/dtangler/core/input/ConfigFileParser.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/input/ConfigFileParser.java similarity index 96% rename from dtangler-core/src/main/java/org/dtangler/core/input/ConfigFileParser.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/input/ConfigFileParser.java index e7ffac8..574a7c4 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/input/ConfigFileParser.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/input/ConfigFileParser.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.input; +package org.hjug.dtangler.core.input; import java.io.ByteArrayInputStream; import java.io.File; @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Properties; -import org.dtangler.core.exception.DtException; +import org.hjug.dtangler.core.exception.DtException; public class ConfigFileParser { private Properties properties; diff --git a/dtangler-core/src/main/java/org/dtangler/core/input/ConfigFileWriter.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/input/ConfigFileWriter.java similarity index 93% rename from dtangler-core/src/main/java/org/dtangler/core/input/ConfigFileWriter.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/input/ConfigFileWriter.java index 7672727..ee1121c 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/input/ConfigFileWriter.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/input/ConfigFileWriter.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.input; +package org.hjug.dtangler.core.input; import java.io.BufferedWriter; import java.io.File; @@ -15,10 +15,10 @@ import java.util.Set; import java.util.Map.Entry; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.Group; -import org.dtangler.core.configuration.ParserConstants; -import org.dtangler.core.exception.DtException; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.exception.DtException; public class ConfigFileWriter { diff --git a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/ForbiddenDependencyFinder.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/ForbiddenDependencyFinder.java similarity index 89% rename from dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/ForbiddenDependencyFinder.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/ForbiddenDependencyFinder.java index f838b3f..dc0c4ea 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/ForbiddenDependencyFinder.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/ForbiddenDependencyFinder.java @@ -3,15 +3,15 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.ruleanalysis; +package org.hjug.dtangler.core.ruleanalysis; import java.util.List; import java.util.Set; -import org.dtangler.core.analysis.DependencyAnalyzer; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.analysis.DependencyAnalyzer; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Dependency; public class ForbiddenDependencyFinder extends DependencyAnalyzer { private final RuleFilter ruleFilter; diff --git a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/GroupRuleMember.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/GroupRuleMember.java similarity index 87% rename from dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/GroupRuleMember.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/GroupRuleMember.java index 2724d91..9be9ead 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/GroupRuleMember.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/GroupRuleMember.java @@ -3,11 +3,11 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.ruleanalysis; +package org.hjug.dtangler.core.ruleanalysis; -import org.dtangler.core.configuration.Group; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.util.WildcardMatch; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.util.WildcardMatch; public class GroupRuleMember implements RuleMember { private Group group; diff --git a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/Rule.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/Rule.java similarity index 93% rename from dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/Rule.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/Rule.java index 52a5db4..d8612d3 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/Rule.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/Rule.java @@ -3,12 +3,12 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.ruleanalysis; +package org.hjug.dtangler.core.ruleanalysis; import java.util.Set; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependency; public class Rule { diff --git a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/RuleCreator.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/RuleCreator.java similarity index 90% rename from dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/RuleCreator.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/RuleCreator.java index 3c4cc5e..07cea1e 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/RuleCreator.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/RuleCreator.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.ruleanalysis; +package org.hjug.dtangler.core.ruleanalysis; import java.util.ArrayList; import java.util.HashSet; @@ -11,9 +11,9 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.configuration.Group; -import org.dtangler.core.configuration.ParserConstants; -import org.dtangler.core.exception.DtException; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.exception.DtException; public class RuleCreator { private Map> forbiddenDependencies; diff --git a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/RuleFilter.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/RuleFilter.java similarity index 89% rename from dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/RuleFilter.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/RuleFilter.java index 15c50f6..a8ba5d0 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/RuleFilter.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/RuleFilter.java @@ -3,14 +3,14 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.ruleanalysis; +package org.hjug.dtangler.core.ruleanalysis; import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; public class RuleFilter { private List rules; diff --git a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/RuleMember.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/RuleMember.java similarity index 74% rename from dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/RuleMember.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/RuleMember.java index e62cead..b0458a2 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/RuleMember.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/RuleMember.java @@ -3,9 +3,9 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.ruleanalysis; +package org.hjug.dtangler.core.ruleanalysis; -import org.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependable; public interface RuleMember { String getName(); diff --git a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/RuleViolation.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/RuleViolation.java similarity index 86% rename from dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/RuleViolation.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/RuleViolation.java index 46b6f5f..b505d3b 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/RuleViolation.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/RuleViolation.java @@ -3,15 +3,15 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.ruleanalysis; +package org.hjug.dtangler.core.ruleanalysis; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependency; public class RuleViolation implements Violation { diff --git a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/SingleRuleMember.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/SingleRuleMember.java similarity index 89% rename from dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/SingleRuleMember.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/SingleRuleMember.java index 9879230..7cd4539 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/ruleanalysis/SingleRuleMember.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/ruleanalysis/SingleRuleMember.java @@ -3,9 +3,9 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.ruleanalysis; +package org.hjug.dtangler.core.ruleanalysis; -import org.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependable; public class SingleRuleMember implements RuleMember { diff --git a/dtangler-core/src/main/java/org/dtangler/core/textui/DSMWriter.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/textui/DSMWriter.java similarity index 87% rename from dtangler-core/src/main/java/org/dtangler/core/textui/DSMWriter.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/textui/DSMWriter.java index d8c1985..25d54cd 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/textui/DSMWriter.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/textui/DSMWriter.java @@ -3,13 +3,13 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.textui; +package org.hjug.dtangler.core.textui; -import org.dtangler.core.analysisresult.AnalysisResult; -import org.dtangler.core.analysisresult.Violation.Severity; -import org.dtangler.core.dsm.Dsm; -import org.dtangler.core.dsm.DsmCell; -import org.dtangler.core.dsm.DsmRow; +import org.hjug.dtangler.core.analysisresult.AnalysisResult; +import org.hjug.dtangler.core.analysisresult.Violation.Severity; +import org.hjug.dtangler.core.dsm.Dsm; +import org.hjug.dtangler.core.dsm.DsmCell; +import org.hjug.dtangler.core.dsm.DsmRow; public class DSMWriter { diff --git a/dtangler-core/src/main/java/org/dtangler/core/textui/SysoutWriter.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/textui/SysoutWriter.java similarity index 90% rename from dtangler-core/src/main/java/org/dtangler/core/textui/SysoutWriter.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/textui/SysoutWriter.java index 5fb1f81..666df1b 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/textui/SysoutWriter.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/textui/SysoutWriter.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.textui; +package org.hjug.dtangler.core.textui; public class SysoutWriter implements Writer { public void print(String s) { diff --git a/dtangler-core/src/main/java/org/dtangler/core/textui/ViolationWriter.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/textui/ViolationWriter.java similarity index 91% rename from dtangler-core/src/main/java/org/dtangler/core/textui/ViolationWriter.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/textui/ViolationWriter.java index 9c4630f..5cb95ae 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/textui/ViolationWriter.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/textui/ViolationWriter.java @@ -3,14 +3,14 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.textui; +package org.hjug.dtangler.core.textui; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; -import org.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.analysisresult.Violation; public class ViolationWriter { private final Writer writer; diff --git a/dtangler-core/src/main/java/org/dtangler/core/textui/Writer.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/textui/Writer.java similarity index 87% rename from dtangler-core/src/main/java/org/dtangler/core/textui/Writer.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/textui/Writer.java index ac54b2e..ff70871 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/textui/Writer.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/textui/Writer.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.textui; +package org.hjug.dtangler.core.textui; public interface Writer { diff --git a/dtangler-core/src/main/java/org/dtangler/core/util/WildcardMatch.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/util/WildcardMatch.java similarity index 96% rename from dtangler-core/src/main/java/org/dtangler/core/util/WildcardMatch.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/util/WildcardMatch.java index c1c7d63..e936c18 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/util/WildcardMatch.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/util/WildcardMatch.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.util; +package org.hjug.dtangler.core.util; import java.util.regex.Pattern; diff --git a/dtangler-core/src/main/java/org/dtangler/core/versioninfo/VersionInfo.java b/dtangler-core/src/main/java/org/hjug/dtangler/core/versioninfo/VersionInfo.java similarity index 88% rename from dtangler-core/src/main/java/org/dtangler/core/versioninfo/VersionInfo.java rename to dtangler-core/src/main/java/org/hjug/dtangler/core/versioninfo/VersionInfo.java index 2e6f044..c86d89e 100644 --- a/dtangler-core/src/main/java/org/dtangler/core/versioninfo/VersionInfo.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/core/versioninfo/VersionInfo.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.versioninfo; +package org.hjug.dtangler.core.versioninfo; public class VersionInfo { diff --git a/dtangler-core/src/main/java/org/dtangler/genericengine/dependenciesstreamparser/ItemDependenciesStreamParser.java b/dtangler-core/src/main/java/org/hjug/dtangler/genericengine/dependenciesstreamparser/ItemDependenciesStreamParser.java similarity index 97% rename from dtangler-core/src/main/java/org/dtangler/genericengine/dependenciesstreamparser/ItemDependenciesStreamParser.java rename to dtangler-core/src/main/java/org/hjug/dtangler/genericengine/dependenciesstreamparser/ItemDependenciesStreamParser.java index 9616e1a..ad1ca05 100644 --- a/dtangler-core/src/main/java/org/dtangler/genericengine/dependenciesstreamparser/ItemDependenciesStreamParser.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/genericengine/dependenciesstreamparser/ItemDependenciesStreamParser.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.genericengine.dependenciesstreamparser; +package org.hjug.dtangler.genericengine.dependenciesstreamparser; import java.io.BufferedReader; import java.io.File; @@ -18,9 +18,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.dtangler.core.exception.DtException; -import org.dtangler.genericengine.types.Item; -import org.dtangler.genericengine.types.ValidScopes; +import org.hjug.dtangler.core.exception.DtException; +import org.hjug.dtangler.genericengine.types.Item; +import org.hjug.dtangler.genericengine.types.ValidScopes; /** * Parser for the dependency definitions stream. diff --git a/dtangler-core/src/main/java/org/dtangler/genericengine/dependencyengine/GenericDependencyEngine.java b/dtangler-core/src/main/java/org/hjug/dtangler/genericengine/dependencyengine/GenericDependencyEngine.java similarity index 81% rename from dtangler-core/src/main/java/org/dtangler/genericengine/dependencyengine/GenericDependencyEngine.java rename to dtangler-core/src/main/java/org/hjug/dtangler/genericengine/dependencyengine/GenericDependencyEngine.java index 29726d5..ad9b2b7 100644 --- a/dtangler-core/src/main/java/org/dtangler/genericengine/dependencyengine/GenericDependencyEngine.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/genericengine/dependencyengine/GenericDependencyEngine.java @@ -3,23 +3,23 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.genericengine.dependencyengine; +package org.hjug.dtangler.genericengine.dependencyengine; import java.io.File; import java.util.*; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Scope; -import org.dtangler.core.dependencyengine.AbstractDependencyEngine; -import org.dtangler.core.dependencyengine.DependencyEngine; -import org.dtangler.core.exception.DtException; -import org.dtangler.core.filefinder.FullPathWildCardFileFilter; -import org.dtangler.core.filefinder.RecursiveFileFinder; -import org.dtangler.genericengine.dependenciesstreamparser.ItemDependenciesStreamParser; -import org.dtangler.genericengine.types.Item; -import org.dtangler.genericengine.types.ItemScope; -import org.dtangler.genericengine.types.ValidScopes; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Scope; +import org.hjug.dtangler.core.dependencyengine.AbstractDependencyEngine; +import org.hjug.dtangler.core.dependencyengine.DependencyEngine; +import org.hjug.dtangler.core.exception.DtException; +import org.hjug.dtangler.core.filefinder.FullPathWildCardFileFilter; +import org.hjug.dtangler.core.filefinder.RecursiveFileFinder; +import org.hjug.dtangler.genericengine.dependenciesstreamparser.ItemDependenciesStreamParser; +import org.hjug.dtangler.genericengine.types.Item; +import org.hjug.dtangler.genericengine.types.ItemScope; +import org.hjug.dtangler.genericengine.types.ValidScopes; public class GenericDependencyEngine extends AbstractDependencyEngine { diff --git a/dtangler-core/src/main/java/org/dtangler/genericengine/dependencyengine/ItemDependencyBuilder.java b/dtangler-core/src/main/java/org/hjug/dtangler/genericengine/dependencyengine/ItemDependencyBuilder.java similarity index 90% rename from dtangler-core/src/main/java/org/dtangler/genericengine/dependencyengine/ItemDependencyBuilder.java rename to dtangler-core/src/main/java/org/hjug/dtangler/genericengine/dependencyengine/ItemDependencyBuilder.java index 289896c..a910f88 100644 --- a/dtangler-core/src/main/java/org/dtangler/genericengine/dependencyengine/ItemDependencyBuilder.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/genericengine/dependencyengine/ItemDependencyBuilder.java @@ -3,17 +3,17 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.genericengine.dependencyengine; +package org.hjug.dtangler.genericengine.dependencyengine; import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.genericengine.types.Item; -import org.dtangler.genericengine.types.ItemScope; -import org.dtangler.genericengine.types.ValidScopes; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.genericengine.types.Item; +import org.hjug.dtangler.genericengine.types.ItemScope; +import org.hjug.dtangler.genericengine.types.ValidScopes; public class ItemDependencyBuilder { diff --git a/dtangler-core/src/main/java/org/dtangler/genericengine/types/Item.java b/dtangler-core/src/main/java/org/hjug/dtangler/genericengine/types/Item.java similarity index 98% rename from dtangler-core/src/main/java/org/dtangler/genericengine/types/Item.java rename to dtangler-core/src/main/java/org/hjug/dtangler/genericengine/types/Item.java index c142bc2..15af53d 100644 --- a/dtangler-core/src/main/java/org/dtangler/genericengine/types/Item.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/genericengine/types/Item.java @@ -3,14 +3,14 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.genericengine.types; +package org.hjug.dtangler.genericengine.types; import java.net.URLDecoder; import java.net.URLEncoder; import java.util.HashMap; import java.util.Map; -import org.dtangler.core.exception.DtException; +import org.hjug.dtangler.core.exception.DtException; public class Item { diff --git a/dtangler-core/src/main/java/org/dtangler/genericengine/types/ItemScope.java b/dtangler-core/src/main/java/org/hjug/dtangler/genericengine/types/ItemScope.java similarity index 85% rename from dtangler-core/src/main/java/org/dtangler/genericengine/types/ItemScope.java rename to dtangler-core/src/main/java/org/hjug/dtangler/genericengine/types/ItemScope.java index d6b7e47..fca48b3 100644 --- a/dtangler-core/src/main/java/org/dtangler/genericengine/types/ItemScope.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/genericengine/types/ItemScope.java @@ -3,10 +3,10 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.genericengine.types; +package org.hjug.dtangler.genericengine.types; -import org.dtangler.core.dependencies.Scope; -import org.dtangler.core.exception.DtException; +import org.hjug.dtangler.core.dependencies.Scope; +import org.hjug.dtangler.core.exception.DtException; public class ItemScope implements Scope { diff --git a/dtangler-core/src/main/java/org/dtangler/genericengine/types/ValidScopes.java b/dtangler-core/src/main/java/org/hjug/dtangler/genericengine/types/ValidScopes.java similarity index 96% rename from dtangler-core/src/main/java/org/dtangler/genericengine/types/ValidScopes.java rename to dtangler-core/src/main/java/org/hjug/dtangler/genericengine/types/ValidScopes.java index a48eb41..28efa3e 100644 --- a/dtangler-core/src/main/java/org/dtangler/genericengine/types/ValidScopes.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/genericengine/types/ValidScopes.java @@ -1,9 +1,9 @@ -package org.dtangler.genericengine.types; +package org.hjug.dtangler.genericengine.types; import java.util.ArrayList; import java.util.List; -import org.dtangler.core.exception.DtException; +import org.hjug.dtangler.core.exception.DtException; public class ValidScopes { diff --git a/dtangler-core/src/main/java/org/dtangler/javaengine/classfileparser/ClassFileParser.java b/dtangler-core/src/main/java/org/hjug/dtangler/javaengine/classfileparser/ClassFileParser.java similarity index 98% rename from dtangler-core/src/main/java/org/dtangler/javaengine/classfileparser/ClassFileParser.java rename to dtangler-core/src/main/java/org/hjug/dtangler/javaengine/classfileparser/ClassFileParser.java index a5dca91..dcef33a 100644 --- a/dtangler-core/src/main/java/org/dtangler/javaengine/classfileparser/ClassFileParser.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/javaengine/classfileparser/ClassFileParser.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser; +package org.hjug.dtangler.javaengine.classfileparser; import java.io.ByteArrayInputStream; import java.io.DataInput; @@ -15,7 +15,7 @@ import java.util.Collections; import java.util.List; -import org.dtangler.javaengine.types.JavaClass; +import org.hjug.dtangler.javaengine.types.JavaClass; public class ClassFileParser { diff --git a/dtangler-core/src/main/java/org/dtangler/javaengine/dependencyengine/ClassDependencies.java b/dtangler-core/src/main/java/org/hjug/dtangler/javaengine/dependencyengine/ClassDependencies.java similarity index 91% rename from dtangler-core/src/main/java/org/dtangler/javaengine/dependencyengine/ClassDependencies.java rename to dtangler-core/src/main/java/org/hjug/dtangler/javaengine/dependencyengine/ClassDependencies.java index 92dcba5..43f3d67 100644 --- a/dtangler-core/src/main/java/org/dtangler/javaengine/dependencyengine/ClassDependencies.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/javaengine/dependencyengine/ClassDependencies.java @@ -3,16 +3,16 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.dependencyengine; +package org.hjug.dtangler.javaengine.dependencyengine; import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.javaengine.types.JavaClass; -import org.dtangler.javaengine.types.JavaScope; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.javaengine.types.JavaClass; +import org.hjug.dtangler.javaengine.types.JavaScope; public class ClassDependencies { diff --git a/dtangler-core/src/main/java/org/dtangler/javaengine/dependencyengine/InnerClassNormalizer.java b/dtangler-core/src/main/java/org/hjug/dtangler/javaengine/dependencyengine/InnerClassNormalizer.java similarity index 91% rename from dtangler-core/src/main/java/org/dtangler/javaengine/dependencyengine/InnerClassNormalizer.java rename to dtangler-core/src/main/java/org/hjug/dtangler/javaengine/dependencyengine/InnerClassNormalizer.java index 5cfd543..557ce09 100644 --- a/dtangler-core/src/main/java/org/dtangler/javaengine/dependencyengine/InnerClassNormalizer.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/javaengine/dependencyengine/InnerClassNormalizer.java @@ -3,14 +3,14 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.dependencyengine; +package org.hjug.dtangler.javaengine.dependencyengine; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.dtangler.javaengine.types.JavaClass; +import org.hjug.dtangler.javaengine.types.JavaClass; public class InnerClassNormalizer { diff --git a/dtangler-core/src/main/java/org/dtangler/javaengine/dependencyengine/JavaDependencyEngine.java b/dtangler-core/src/main/java/org/hjug/dtangler/javaengine/dependencyengine/JavaDependencyEngine.java similarity index 80% rename from dtangler-core/src/main/java/org/dtangler/javaengine/dependencyengine/JavaDependencyEngine.java rename to dtangler-core/src/main/java/org/hjug/dtangler/javaengine/dependencyengine/JavaDependencyEngine.java index 9c848f2..3dfc838 100644 --- a/dtangler-core/src/main/java/org/dtangler/javaengine/dependencyengine/JavaDependencyEngine.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/javaengine/dependencyengine/JavaDependencyEngine.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.dependencyengine; +package org.hjug.dtangler.javaengine.dependencyengine; import java.io.File; import java.io.IOException; @@ -12,18 +12,18 @@ import java.util.List; import java.util.Set; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Scope; -import org.dtangler.core.dependencyengine.AbstractDependencyEngine; -import org.dtangler.core.dependencyengine.DependencyEngine; -import org.dtangler.core.exception.DtException; -import org.dtangler.core.filefinder.FullPathWildCardFileFilter; -import org.dtangler.core.filefinder.RecursiveFileFinder; -import org.dtangler.javaengine.classfileparser.ClassFileParser; -import org.dtangler.javaengine.jarfileparser.JarFileParser; -import org.dtangler.javaengine.types.JavaClass; -import org.dtangler.javaengine.types.JavaScope; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Scope; +import org.hjug.dtangler.core.dependencyengine.AbstractDependencyEngine; +import org.hjug.dtangler.core.dependencyengine.DependencyEngine; +import org.hjug.dtangler.core.exception.DtException; +import org.hjug.dtangler.core.filefinder.FullPathWildCardFileFilter; +import org.hjug.dtangler.core.filefinder.RecursiveFileFinder; +import org.hjug.dtangler.javaengine.classfileparser.ClassFileParser; +import org.hjug.dtangler.javaengine.jarfileparser.JarFileParser; +import org.hjug.dtangler.javaengine.types.JavaClass; +import org.hjug.dtangler.javaengine.types.JavaScope; public class JavaDependencyEngine extends AbstractDependencyEngine { diff --git a/dtangler-core/src/main/java/org/dtangler/javaengine/jarfileparser/JarFileParser.java b/dtangler-core/src/main/java/org/hjug/dtangler/javaengine/jarfileparser/JarFileParser.java similarity index 91% rename from dtangler-core/src/main/java/org/dtangler/javaengine/jarfileparser/JarFileParser.java rename to dtangler-core/src/main/java/org/hjug/dtangler/javaengine/jarfileparser/JarFileParser.java index 5630531..2639dba 100644 --- a/dtangler-core/src/main/java/org/dtangler/javaengine/jarfileparser/JarFileParser.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/javaengine/jarfileparser/JarFileParser.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.jarfileparser; +package org.hjug.dtangler.javaengine.jarfileparser; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -19,8 +19,8 @@ import java.util.jar.JarEntry; import java.util.jar.JarInputStream; -import org.dtangler.javaengine.classfileparser.ClassFileParser; -import org.dtangler.javaengine.types.JavaClass; +import org.hjug.dtangler.javaengine.classfileparser.ClassFileParser; +import org.hjug.dtangler.javaengine.types.JavaClass; public class JarFileParser { diff --git a/dtangler-core/src/main/java/org/dtangler/javaengine/types/JavaClass.java b/dtangler-core/src/main/java/org/hjug/dtangler/javaengine/types/JavaClass.java similarity index 97% rename from dtangler-core/src/main/java/org/dtangler/javaengine/types/JavaClass.java rename to dtangler-core/src/main/java/org/hjug/dtangler/javaengine/types/JavaClass.java index 4c1a901..5589067 100644 --- a/dtangler-core/src/main/java/org/dtangler/javaengine/types/JavaClass.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/javaengine/types/JavaClass.java @@ -3,13 +3,13 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.types; +package org.hjug.dtangler.javaengine.types; import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependable; public class JavaClass { diff --git a/dtangler-core/src/main/java/org/dtangler/javaengine/types/JavaScope.java b/dtangler-core/src/main/java/org/hjug/dtangler/javaengine/types/JavaScope.java similarity index 79% rename from dtangler-core/src/main/java/org/dtangler/javaengine/types/JavaScope.java rename to dtangler-core/src/main/java/org/hjug/dtangler/javaengine/types/JavaScope.java index 69fe235..8e91cd0 100644 --- a/dtangler-core/src/main/java/org/dtangler/javaengine/types/JavaScope.java +++ b/dtangler-core/src/main/java/org/hjug/dtangler/javaengine/types/JavaScope.java @@ -3,9 +3,9 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.types; +package org.hjug.dtangler.javaengine.types; -import org.dtangler.core.dependencies.Scope; +import org.hjug.dtangler.core.dependencies.Scope; public enum JavaScope implements Scope { locations, packages, classes; diff --git a/dtangler-core/src/main/resources/org/dtangler/dependency-engine-generic.properties b/dtangler-core/src/main/resources/org/dtangler/dependency-engine-generic.properties deleted file mode 100644 index 2a4372c..0000000 --- a/dtangler-core/src/main/resources/org/dtangler/dependency-engine-generic.properties +++ /dev/null @@ -1,4 +0,0 @@ - -id = generic - -className = org.dtangler.genericengine.dependencyengine.GenericDependencyEngine diff --git a/dtangler-core/src/main/resources/org/dtangler/dependency-engine-java.properties b/dtangler-core/src/main/resources/org/dtangler/dependency-engine-java.properties deleted file mode 100644 index 689b894..0000000 --- a/dtangler-core/src/main/resources/org/dtangler/dependency-engine-java.properties +++ /dev/null @@ -1,4 +0,0 @@ - -id = java - -className = org.dtangler.javaengine.dependencyengine.JavaDependencyEngine diff --git a/dtangler-core/src/main/resources/org/hjug/dtangler/dependency-engine-generic.properties b/dtangler-core/src/main/resources/org/hjug/dtangler/dependency-engine-generic.properties new file mode 100644 index 0000000..df2bdf9 --- /dev/null +++ b/dtangler-core/src/main/resources/org/hjug/dtangler/dependency-engine-generic.properties @@ -0,0 +1,4 @@ + +id = generic + +className = org.hjug.dtangler.genericengine.dependencyengine.GenericDependencyEngine diff --git a/dtangler-core/src/main/resources/org/hjug/dtangler/dependency-engine-java.properties b/dtangler-core/src/main/resources/org/hjug/dtangler/dependency-engine-java.properties new file mode 100644 index 0000000..12810ac --- /dev/null +++ b/dtangler-core/src/main/resources/org/hjug/dtangler/dependency-engine-java.properties @@ -0,0 +1,4 @@ + +id = java + +className = org.hjug.dtangler.javaengine.dependencyengine.JavaDependencyEngine diff --git a/dtangler-core/src/main/resources/org/dtangler/dependency-engine-pool.properties b/dtangler-core/src/main/resources/org/hjug/dtangler/dependency-engine-pool.properties similarity index 100% rename from dtangler-core/src/main/resources/org/dtangler/dependency-engine-pool.properties rename to dtangler-core/src/main/resources/org/hjug/dtangler/dependency-engine-pool.properties diff --git a/dtangler-core/src/test/java/org/dtangler/core/CommandLineAppTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/CommandLineAppTest.java similarity index 86% rename from dtangler-core/src/test/java/org/dtangler/core/CommandLineAppTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/CommandLineAppTest.java index bf08494..2c5ccd4 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/CommandLineAppTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/CommandLineAppTest.java @@ -3,17 +3,17 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core; +package org.hjug.dtangler.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.dtangler.core.configuration.ParserConstants; -import org.dtangler.core.input.CommandLineParser; -import org.dtangler.core.testutil.ClassPathEntryFinder; -import org.dtangler.core.testutil.output.FileUtil; -import org.dtangler.core.testutil.output.MockWriter; +import org.hjug.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.input.CommandLineParser; +import org.hjug.dtangler.core.testutil.ClassPathEntryFinder; +import org.hjug.dtangler.core.testutil.output.FileUtil; +import org.hjug.dtangler.core.testutil.output.MockWriter; import org.junit.Test; public class CommandLineAppTest { @@ -32,8 +32,8 @@ public class CommandLineAppTest { private String inputArg2 = inputKey + ClassPathEntryFinder.getPathContaining("testdata-good-deps"); - private final String package1 = "org.dtangler.core.testutil.cyclic.part1"; - private final String package2 = "org.dtangler.core.testutil.cyclic.part2"; + private final String package1 = "org.hjug.dtangler.core.testutil.cyclic.part1"; + private final String package2 = "org.hjug.dtangler.core.testutil.cyclic.part2"; @Test public void testRunWithWrongPath() { diff --git a/dtangler-core/src/test/java/org/dtangler/core/MainTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/MainTest.java similarity index 98% rename from dtangler-core/src/test/java/org/dtangler/core/MainTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/MainTest.java index a004e2b..c93b80a 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/MainTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/MainTest.java @@ -1,4 +1,4 @@ -package org.dtangler.core; +package org.hjug.dtangler.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/dsm/DsmAcceptanceTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/dsm/DsmAcceptanceTest.java similarity index 86% rename from dtangler-core/src/test/java/org/dtangler/core/acceptancetests/dsm/DsmAcceptanceTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/dsm/DsmAcceptanceTest.java index 5dc6e64..afc1680 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/dsm/DsmAcceptanceTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/dsm/DsmAcceptanceTest.java @@ -3,18 +3,18 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.acceptancetests.dsm; +package org.hjug.dtangler.core.acceptancetests.dsm; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.Arrays; -import org.dtangler.core.dependencies.DependencyGraph; -import org.dtangler.core.dsm.Dsm; -import org.dtangler.core.dsmengine.DsmEngine; -import org.dtangler.core.testutil.dependenciesbuilder.DependencyGraphBuilder; -import org.dtangler.core.testutil.dsmdriver.DsmDriver; +import org.hjug.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.core.dsm.Dsm; +import org.hjug.dtangler.core.dsmengine.DsmEngine; +import org.hjug.dtangler.core.testutil.dependenciesbuilder.DependencyGraphBuilder; +import org.hjug.dtangler.core.testutil.dsmdriver.DsmDriver; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/end2end/ClassFile2TextUiAcceptanceTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/end2end/ClassFile2TextUiAcceptanceTest.java similarity index 77% rename from dtangler-core/src/test/java/org/dtangler/core/acceptancetests/end2end/ClassFile2TextUiAcceptanceTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/end2end/ClassFile2TextUiAcceptanceTest.java index 3154fad..6bc7a86 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/end2end/ClassFile2TextUiAcceptanceTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/end2end/ClassFile2TextUiAcceptanceTest.java @@ -3,16 +3,16 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.acceptancetests.end2end; +package org.hjug.dtangler.core.acceptancetests.end2end; import static org.junit.Assert.assertEquals; -import org.dtangler.core.CommandLineApp; -import org.dtangler.core.configuration.ParserConstants; -import org.dtangler.core.input.CommandLineParser; -import org.dtangler.core.testutil.ClassPathEntryFinder; -import org.dtangler.core.testutil.output.FileUtil; -import org.dtangler.core.testutil.output.MockWriter; +import org.hjug.dtangler.core.CommandLineApp; +import org.hjug.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.input.CommandLineParser; +import org.hjug.dtangler.core.testutil.ClassPathEntryFinder; +import org.hjug.dtangler.core.testutil.output.FileUtil; +import org.hjug.dtangler.core.testutil.output.MockWriter; import org.junit.Test; /** diff --git a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/input/ConfigurationParsingAcceptanceTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/input/ConfigurationParsingAcceptanceTest.java similarity index 95% rename from dtangler-core/src/test/java/org/dtangler/core/acceptancetests/input/ConfigurationParsingAcceptanceTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/input/ConfigurationParsingAcceptanceTest.java index c364207..7230fa1 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/input/ConfigurationParsingAcceptanceTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/input/ConfigurationParsingAcceptanceTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.acceptancetests.input; +package org.hjug.dtangler.core.acceptancetests.input; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -16,11 +16,11 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.Group; -import org.dtangler.core.configuration.ParserConstants; -import org.dtangler.core.input.ArgumentBuilder; -import org.dtangler.core.input.CommandLineParser; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.input.ArgumentBuilder; +import org.hjug.dtangler.core.input.CommandLineParser; import org.junit.Test; public class ConfigurationParsingAcceptanceTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/input/GenericEngineArgumentParsingAcceptanceTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/input/GenericEngineArgumentParsingAcceptanceTest.java similarity index 85% rename from dtangler-core/src/test/java/org/dtangler/core/acceptancetests/input/GenericEngineArgumentParsingAcceptanceTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/input/GenericEngineArgumentParsingAcceptanceTest.java index c1b3d1e..c440d8d 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/input/GenericEngineArgumentParsingAcceptanceTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/input/GenericEngineArgumentParsingAcceptanceTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.acceptancetests.input; +package org.hjug.dtangler.core.acceptancetests.input; import static org.junit.Assert.assertEquals; @@ -13,15 +13,15 @@ import java.util.Collections; import java.util.Set; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.ParserConstants; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.input.ArgumentBuilder; -import org.dtangler.core.input.CommandLineParser; -import org.dtangler.core.testutil.ClassPathEntryFinder; -import org.dtangler.genericengine.dependencyengine.GenericDependencyEngine; -import org.dtangler.genericengine.types.ItemScope; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.input.ArgumentBuilder; +import org.hjug.dtangler.core.input.CommandLineParser; +import org.hjug.dtangler.core.testutil.ClassPathEntryFinder; +import org.hjug.dtangler.genericengine.dependencyengine.GenericDependencyEngine; +import org.hjug.dtangler.genericengine.types.ItemScope; import org.junit.Test; public class GenericEngineArgumentParsingAcceptanceTest { @@ -112,7 +112,7 @@ public void defaultScope() { */ String corePath = ClassPathEntryFinder.getPathContaining("core"); String dtPath = corePath - + "/org/dtangler/core/acceptancetests/input/dependencies.dt"; + + "/org/hjug/dtangler/core/acceptancetests/input/dependencies.dt"; Arguments args = new Arguments(); args.setInput(Collections.singletonList(dtPath)); @@ -153,7 +153,7 @@ public void definedScope() { String corePath = ClassPathEntryFinder.getPathContaining("core"); String dtPath = corePath - + "/org/dtangler/genericengine/dependencyengine/testdata/testParsing2.dt"; + + "/org/hjug/dtangler/genericengine/dependencyengine/testdata/testParsing2.dt"; String scope = scopeKey + "2"; diff --git a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/input/JavaArgumentParsingAcceptanceTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/input/JavaArgumentParsingAcceptanceTest.java similarity index 86% rename from dtangler-core/src/test/java/org/dtangler/core/acceptancetests/input/JavaArgumentParsingAcceptanceTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/input/JavaArgumentParsingAcceptanceTest.java index b97a202..46764d5 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/input/JavaArgumentParsingAcceptanceTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/input/JavaArgumentParsingAcceptanceTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.acceptancetests.input; +package org.hjug.dtangler.core.acceptancetests.input; import static org.junit.Assert.assertEquals; @@ -13,14 +13,14 @@ import java.util.Iterator; import java.util.Set; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.ParserConstants; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.input.ArgumentBuilder; -import org.dtangler.core.input.CommandLineParser; -import org.dtangler.core.testutil.ClassPathEntryFinder; -import org.dtangler.javaengine.dependencyengine.JavaDependencyEngine; -import org.dtangler.javaengine.types.JavaScope; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.input.ArgumentBuilder; +import org.hjug.dtangler.core.input.CommandLineParser; +import org.hjug.dtangler.core.testutil.ClassPathEntryFinder; +import org.hjug.dtangler.javaengine.dependencyengine.JavaDependencyEngine; +import org.hjug.dtangler.javaengine.types.JavaScope; import org.junit.Test; public class JavaArgumentParsingAcceptanceTest { @@ -81,7 +81,7 @@ public void jarsOnLocationScope() { final String s = File.separator; String path = ClassPathEntryFinder.getPathContaining("core") + s - + "org" + s + "dtangler" + s + "core" + s + "acceptancetests" + + "org" + s + "hjug" + s + "dtangler" + s + "core" + s + "acceptancetests" + s + "testdata"; String jarPath = path + s + "jarexample.jar"; String classPath = path + s + "classes"; diff --git a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/input/SetupParsingAcceptanceTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/input/SetupParsingAcceptanceTest.java similarity index 89% rename from dtangler-core/src/test/java/org/dtangler/core/acceptancetests/input/SetupParsingAcceptanceTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/input/SetupParsingAcceptanceTest.java index 7d7947a..fa6e46b 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/input/SetupParsingAcceptanceTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/input/SetupParsingAcceptanceTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.acceptancetests.input; +package org.hjug.dtangler.core.acceptancetests.input; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -12,16 +12,16 @@ import java.io.File; import java.util.*; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.ParserConstants; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.TestDependable; -import org.dtangler.core.input.ArgumentBuilder; -import org.dtangler.core.input.CommandLineParser; -import org.dtangler.core.testutil.ClassPathEntryFinder; -import org.dtangler.javaengine.dependencyengine.JavaDependencyEngine; -import org.dtangler.javaengine.types.JavaScope; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.input.ArgumentBuilder; +import org.hjug.dtangler.core.input.CommandLineParser; +import org.hjug.dtangler.core.testutil.ClassPathEntryFinder; +import org.hjug.dtangler.javaengine.dependencyengine.JavaDependencyEngine; +import org.hjug.dtangler.javaengine.types.JavaScope; import org.junit.Test; public class SetupParsingAcceptanceTest { @@ -163,7 +163,7 @@ public void supportedFileTypes() { */ final String s = File.separator; String path = ClassPathEntryFinder.getPathContaining("core") + s - + "org" + s + "dtangler" + s + "core" + s + "acceptancetests" + + "org" + s + "hjug" + s + "dtangler" + s + "core" + s + "acceptancetests" + s + "testdata"; String jarPath = path + s + "jarexample.jar"; String classPath = path + s + "classes"; @@ -177,7 +177,7 @@ public void supportedFileTypes() { Set actual = dependencies.getAllItems(); Set expected = createDependables("ClassOutsideJar", - "org.dtangler.core.acceptancetests.testdata.classes", classPath); + "org.hjug.dtangler.core.acceptancetests.testdata.classes", classPath); expected.addAll(createDependables("JarClass1", "jar.example", jarPath)); expected.addAll(createDependables("JarClass2", "jar.example", jarPath)); diff --git a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/testdata/classes/ClassOutsideJar.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/testdata/classes/ClassOutsideJar.java similarity index 77% rename from dtangler-core/src/test/java/org/dtangler/core/acceptancetests/testdata/classes/ClassOutsideJar.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/testdata/classes/ClassOutsideJar.java index 0fd8fd0..de87dea 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/testdata/classes/ClassOutsideJar.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/testdata/classes/ClassOutsideJar.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.acceptancetests.testdata.classes; +package org.hjug.dtangler.core.acceptancetests.testdata.classes; public class ClassOutsideJar { diff --git a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/validation/ConfigTest1.properties b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/validation/ConfigTest1.properties similarity index 100% rename from dtangler-core/src/test/java/org/dtangler/core/acceptancetests/validation/ConfigTest1.properties rename to dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/validation/ConfigTest1.properties diff --git a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/validation/CycleDetectionAcceptanceTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/validation/CycleDetectionAcceptanceTest.java similarity index 91% rename from dtangler-core/src/test/java/org/dtangler/core/acceptancetests/validation/CycleDetectionAcceptanceTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/validation/CycleDetectionAcceptanceTest.java index 83b9e74..51a7e3c 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/validation/CycleDetectionAcceptanceTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/validation/CycleDetectionAcceptanceTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.acceptancetests.validation; +package org.hjug.dtangler.core.acceptancetests.validation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -13,13 +13,13 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.cycleanalysis.CycleValidator; -import org.dtangler.core.cycleanalysis.DependencyCycle; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Dependency; -import org.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.cycleanalysis.CycleValidator; +import org.hjug.dtangler.core.cycleanalysis.DependencyCycle; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dependencies.TestDependable; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/validation/ReturnValuesAcceptanceTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/validation/ReturnValuesAcceptanceTest.java similarity index 89% rename from dtangler-core/src/test/java/org/dtangler/core/acceptancetests/validation/ReturnValuesAcceptanceTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/validation/ReturnValuesAcceptanceTest.java index 3ddf2f4..daad9f0 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/validation/ReturnValuesAcceptanceTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/validation/ReturnValuesAcceptanceTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.acceptancetests.validation; +package org.hjug.dtangler.core.acceptancetests.validation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -15,25 +15,25 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.analysis.ChildViolation; -import org.dtangler.core.analysis.configurableanalyzer.ConfigurableDependencyAnalyzer; -import org.dtangler.core.analysisresult.AnalysisResult; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.ParserConstants; -import org.dtangler.core.cycleanalysis.DependencyCycle; -import org.dtangler.core.cycleanalysis.TestDependencyCycle; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.TestDependable; -import org.dtangler.core.input.ArgumentBuilder; -import org.dtangler.core.input.CommandLineParser; -import org.dtangler.core.ruleanalysis.Rule; -import org.dtangler.core.testutil.dependenciesbuilder.DependenciesBuilder; -import org.dtangler.core.testutil.dependenciesbuilder.DependencyGraphBuilder; -import org.dtangler.core.testutil.ruleanalysis.MockRule; -import org.dtangler.core.testutil.ruleanalysis.MockRuleViolation; -import org.dtangler.javaengine.types.JavaScope; +import org.hjug.dtangler.core.analysis.ChildViolation; +import org.hjug.dtangler.core.analysis.configurableanalyzer.ConfigurableDependencyAnalyzer; +import org.hjug.dtangler.core.analysisresult.AnalysisResult; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.cycleanalysis.DependencyCycle; +import org.hjug.dtangler.core.cycleanalysis.TestDependencyCycle; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.input.ArgumentBuilder; +import org.hjug.dtangler.core.input.CommandLineParser; +import org.hjug.dtangler.core.ruleanalysis.Rule; +import org.hjug.dtangler.core.testutil.dependenciesbuilder.DependenciesBuilder; +import org.hjug.dtangler.core.testutil.dependenciesbuilder.DependencyGraphBuilder; +import org.hjug.dtangler.core.testutil.ruleanalysis.MockRule; +import org.hjug.dtangler.core.testutil.ruleanalysis.MockRuleViolation; +import org.hjug.dtangler.javaengine.types.JavaScope; import org.junit.Test; public class ReturnValuesAcceptanceTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/validation/ViolationsAndScopesTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/validation/ViolationsAndScopesTest.java similarity index 85% rename from dtangler-core/src/test/java/org/dtangler/core/acceptancetests/validation/ViolationsAndScopesTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/validation/ViolationsAndScopesTest.java index 96348f5..ff312d0 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/acceptancetests/validation/ViolationsAndScopesTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/acceptancetests/validation/ViolationsAndScopesTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.acceptancetests.validation; +package org.hjug.dtangler.core.acceptancetests.validation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -14,23 +14,23 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.analysis.ChildViolation; -import org.dtangler.core.analysis.configurableanalyzer.ConfigurableDependencyAnalyzer; -import org.dtangler.core.analysisresult.AnalysisResult; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.ParserConstants; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Dependency; -import org.dtangler.core.dependencies.TestDependable; -import org.dtangler.core.dependencies.TestScope; -import org.dtangler.core.input.ArgumentBuilder; -import org.dtangler.core.input.CommandLineParser; -import org.dtangler.core.ruleanalysis.Rule; -import org.dtangler.core.ruleanalysis.RuleMember; -import org.dtangler.core.ruleanalysis.RuleViolation; -import org.dtangler.core.ruleanalysis.SingleRuleMember; +import org.hjug.dtangler.core.analysis.ChildViolation; +import org.hjug.dtangler.core.analysis.configurableanalyzer.ConfigurableDependencyAnalyzer; +import org.hjug.dtangler.core.analysisresult.AnalysisResult; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.dependencies.TestScope; +import org.hjug.dtangler.core.input.ArgumentBuilder; +import org.hjug.dtangler.core.input.CommandLineParser; +import org.hjug.dtangler.core.ruleanalysis.Rule; +import org.hjug.dtangler.core.ruleanalysis.RuleMember; +import org.hjug.dtangler.core.ruleanalysis.RuleViolation; +import org.hjug.dtangler.core.ruleanalysis.SingleRuleMember; import org.junit.Test; public class ViolationsAndScopesTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/analysis/AnalysisResultTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/analysis/AnalysisResultTest.java similarity index 92% rename from dtangler-core/src/test/java/org/dtangler/core/analysis/AnalysisResultTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/analysis/AnalysisResultTest.java index 4333c3a..72c7b1e 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/analysis/AnalysisResultTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/analysis/AnalysisResultTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.analysis; +package org.hjug.dtangler.core.analysis; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -17,15 +17,15 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.analysisresult.AnalysisResult; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.analysisresult.Violation.Severity; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependency; -import org.dtangler.core.dependencies.TestDependable; -import org.dtangler.core.dependencies.TestScope; -import org.dtangler.core.ruleanalysis.RuleViolation; -import org.dtangler.core.testutil.ruleanalysis.MockRule; +import org.hjug.dtangler.core.analysisresult.AnalysisResult; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.analysisresult.Violation.Severity; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.dependencies.TestScope; +import org.hjug.dtangler.core.ruleanalysis.RuleViolation; +import org.hjug.dtangler.core.testutil.ruleanalysis.MockRule; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-core/src/test/java/org/dtangler/core/analysis/ChildViolationFinderTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/analysis/ChildViolationFinderTest.java similarity index 88% rename from dtangler-core/src/test/java/org/dtangler/core/analysis/ChildViolationFinderTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/analysis/ChildViolationFinderTest.java index 83acbcb..c25c009 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/analysis/ChildViolationFinderTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/analysis/ChildViolationFinderTest.java @@ -3,24 +3,24 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.analysis; +package org.hjug.dtangler.core.analysis; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.*; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.cycleanalysis.DependencyCycle; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Dependency; -import org.dtangler.core.dependencies.TestDependable; -import org.dtangler.core.dependencies.TestScope; -import org.dtangler.core.ruleanalysis.Rule; -import org.dtangler.core.ruleanalysis.RuleMember; -import org.dtangler.core.ruleanalysis.RuleViolation; -import org.dtangler.core.ruleanalysis.SingleRuleMember; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.cycleanalysis.DependencyCycle; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.dependencies.TestScope; +import org.hjug.dtangler.core.ruleanalysis.Rule; +import org.hjug.dtangler.core.ruleanalysis.RuleMember; +import org.hjug.dtangler.core.ruleanalysis.RuleViolation; +import org.hjug.dtangler.core.ruleanalysis.SingleRuleMember; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-core/src/test/java/org/dtangler/core/analysis/CompositeAnalyzerTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/analysis/CompositeAnalyzerTest.java similarity index 87% rename from dtangler-core/src/test/java/org/dtangler/core/analysis/CompositeAnalyzerTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/analysis/CompositeAnalyzerTest.java index 500e209..402af4f 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/analysis/CompositeAnalyzerTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/analysis/CompositeAnalyzerTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.analysis; +package org.hjug.dtangler.core.analysis; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -14,14 +14,14 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Dependency; -import org.dtangler.core.dependencies.TestDependable; -import org.dtangler.core.ruleanalysis.Rule; -import org.dtangler.core.ruleanalysis.RuleMember; -import org.dtangler.core.ruleanalysis.RuleViolation; -import org.dtangler.core.ruleanalysis.SingleRuleMember; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.ruleanalysis.Rule; +import org.hjug.dtangler.core.ruleanalysis.RuleMember; +import org.hjug.dtangler.core.ruleanalysis.RuleViolation; +import org.hjug.dtangler.core.ruleanalysis.SingleRuleMember; import org.junit.Test; public class CompositeAnalyzerTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/analysis/MockAnalyzer.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/analysis/MockAnalyzer.java similarity index 83% rename from dtangler-core/src/test/java/org/dtangler/core/analysis/MockAnalyzer.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/analysis/MockAnalyzer.java index 98d97a3..ed2c76f 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/analysis/MockAnalyzer.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/analysis/MockAnalyzer.java @@ -3,9 +3,9 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.analysis; +package org.hjug.dtangler.core.analysis; -import org.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Dependencies; public class MockAnalyzer extends DependencyAnalyzer { diff --git a/dtangler-core/src/test/java/org/dtangler/core/analysis/MockViolation.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/analysis/MockViolation.java similarity index 90% rename from dtangler-core/src/test/java/org/dtangler/core/analysis/MockViolation.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/analysis/MockViolation.java index 7bde122..8522b42 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/analysis/MockViolation.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/analysis/MockViolation.java @@ -3,14 +3,14 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.analysis; +package org.hjug.dtangler.core.analysis; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.dependencies.Dependable; public class MockViolation implements Violation { diff --git a/dtangler-core/src/test/java/org/dtangler/core/configuration/ArgumentsTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/configuration/ArgumentsTest.java similarity index 99% rename from dtangler-core/src/test/java/org/dtangler/core/configuration/ArgumentsTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/configuration/ArgumentsTest.java index 4e0eec8..11887c0 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/configuration/ArgumentsTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/configuration/ArgumentsTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.configuration; +package org.hjug.dtangler.core.configuration; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/dtangler-core/src/test/java/org/dtangler/core/configuration/GroupTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/configuration/GroupTest.java similarity index 93% rename from dtangler-core/src/test/java/org/dtangler/core/configuration/GroupTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/configuration/GroupTest.java index edba041..b1158b4 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/configuration/GroupTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/configuration/GroupTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.configuration; +package org.hjug.dtangler.core.configuration; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -12,7 +12,7 @@ import java.util.HashSet; import java.util.Set; -import org.dtangler.core.ruleanalysis.GroupRuleMember; +import org.hjug.dtangler.core.ruleanalysis.GroupRuleMember; import org.junit.Test; public class GroupTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/cycleanalysis/CycleFinderPerformanceTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/cycleanalysis/CycleFinderPerformanceTest.java similarity index 94% rename from dtangler-core/src/test/java/org/dtangler/core/cycleanalysis/CycleFinderPerformanceTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/cycleanalysis/CycleFinderPerformanceTest.java index b8a3e61..0ea33b3 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/cycleanalysis/CycleFinderPerformanceTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/cycleanalysis/CycleFinderPerformanceTest.java @@ -3,16 +3,16 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.cycleanalysis; +package org.hjug.dtangler.core.cycleanalysis; import static org.junit.Assert.assertEquals; import java.util.HashMap; import java.util.Map; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.TestDependable; import org.junit.Test; public class CycleFinderPerformanceTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/cycleanalysis/CycleValidatorTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/cycleanalysis/CycleValidatorTest.java similarity index 88% rename from dtangler-core/src/test/java/org/dtangler/core/cycleanalysis/CycleValidatorTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/cycleanalysis/CycleValidatorTest.java index 4731504..38f6ca0 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/cycleanalysis/CycleValidatorTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/cycleanalysis/CycleValidatorTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.cycleanalysis; +package org.hjug.dtangler.core.cycleanalysis; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -12,11 +12,11 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Dependency; -import org.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dependencies.TestDependable; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-core/src/test/java/org/dtangler/core/cycleanalysis/DependencyCycleDuplicateTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/cycleanalysis/DependencyCycleDuplicateTest.java similarity index 98% rename from dtangler-core/src/test/java/org/dtangler/core/cycleanalysis/DependencyCycleDuplicateTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/cycleanalysis/DependencyCycleDuplicateTest.java index 3fe43c7..b0c6d65 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/cycleanalysis/DependencyCycleDuplicateTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/cycleanalysis/DependencyCycleDuplicateTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.cycleanalysis; +package org.hjug.dtangler.core.cycleanalysis; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/dtangler-core/src/test/java/org/dtangler/core/cycleanalysis/DependencyCycleTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/cycleanalysis/DependencyCycleTest.java similarity index 88% rename from dtangler-core/src/test/java/org/dtangler/core/cycleanalysis/DependencyCycleTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/cycleanalysis/DependencyCycleTest.java index fe31174..616a636 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/cycleanalysis/DependencyCycleTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/cycleanalysis/DependencyCycleTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.cycleanalysis; +package org.hjug.dtangler.core.cycleanalysis; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -13,9 +13,9 @@ import java.util.Collections; import java.util.HashSet; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.TestDependable; import org.junit.Test; public class DependencyCycleTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/cycleanalysis/TestDependencyCycle.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/cycleanalysis/TestDependencyCycle.java similarity index 79% rename from dtangler-core/src/test/java/org/dtangler/core/cycleanalysis/TestDependencyCycle.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/cycleanalysis/TestDependencyCycle.java index 2854baa..1147467 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/cycleanalysis/TestDependencyCycle.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/cycleanalysis/TestDependencyCycle.java @@ -3,13 +3,13 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.cycleanalysis; +package org.hjug.dtangler.core.cycleanalysis; import java.util.ArrayList; import java.util.List; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.TestDependable; public class TestDependencyCycle extends DependencyCycle { diff --git a/dtangler-core/src/test/java/org/dtangler/core/dependencies/DependableTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/DependableTest.java similarity index 95% rename from dtangler-core/src/test/java/org/dtangler/core/dependencies/DependableTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/DependableTest.java index d2dbad0..8413851 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/dependencies/DependableTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/DependableTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencies; +package org.hjug.dtangler.core.dependencies; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/dtangler-core/src/test/java/org/dtangler/core/dependencies/DependenciesTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/DependenciesTest.java similarity index 99% rename from dtangler-core/src/test/java/org/dtangler/core/dependencies/DependenciesTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/DependenciesTest.java index 706877b..dfb042f 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/dependencies/DependenciesTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/DependenciesTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencies; +package org.hjug.dtangler.core.dependencies; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.dependencies.Dependencies.DependencyFilter; +import org.hjug.dtangler.core.dependencies.Dependencies.DependencyFilter; import org.junit.Test; public class DependenciesTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/dependencies/DependencyGraphTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/DependencyGraphTest.java similarity index 98% rename from dtangler-core/src/test/java/org/dtangler/core/dependencies/DependencyGraphTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/DependencyGraphTest.java index bc1f640..48ca78d 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/dependencies/DependencyGraphTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/DependencyGraphTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencies; +package org.hjug.dtangler.core.dependencies; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/dtangler-core/src/test/java/org/dtangler/core/dependencies/DependencyPathTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/DependencyPathTest.java similarity index 96% rename from dtangler-core/src/test/java/org/dtangler/core/dependencies/DependencyPathTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/DependencyPathTest.java index e765396..6afab6d 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/dependencies/DependencyPathTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/DependencyPathTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencies; +package org.hjug.dtangler.core.dependencies; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/dtangler-core/src/test/java/org/dtangler/core/dependencies/DependencyTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/DependencyTest.java similarity index 95% rename from dtangler-core/src/test/java/org/dtangler/core/dependencies/DependencyTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/DependencyTest.java index b733090..b8d56c2 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/dependencies/DependencyTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/DependencyTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencies; +package org.hjug.dtangler.core.dependencies; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/dtangler-core/src/test/java/org/dtangler/core/dependencies/ScopeComparatorTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/ScopeComparatorTest.java similarity index 95% rename from dtangler-core/src/test/java/org/dtangler/core/dependencies/ScopeComparatorTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/ScopeComparatorTest.java index 8b12c9d..a5fd275 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/dependencies/ScopeComparatorTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/dependencies/ScopeComparatorTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencies; +package org.hjug.dtangler.core.dependencies; import static org.junit.Assert.assertSame; diff --git a/dtangler-core/src/test/java/org/dtangler/core/dsmengine/InstabilityComparatorTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/dsmengine/InstabilityComparatorTest.java similarity index 92% rename from dtangler-core/src/test/java/org/dtangler/core/dsmengine/InstabilityComparatorTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/dsmengine/InstabilityComparatorTest.java index b4d09d4..2242658 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/dsmengine/InstabilityComparatorTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/dsmengine/InstabilityComparatorTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dsmengine; +package org.hjug.dtangler.core.dsmengine; import static org.junit.Assert.assertEquals; @@ -13,9 +13,9 @@ import java.util.HashSet; import java.util.List; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.DependencyGraph; -import org.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.core.dependencies.TestDependable; import org.junit.Test; public class InstabilityComparatorTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/filefinder/FullPathWildCardFileFilterTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/FullPathWildCardFileFilterTest.java similarity index 98% rename from dtangler-core/src/test/java/org/dtangler/core/filefinder/FullPathWildCardFileFilterTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/FullPathWildCardFileFilterTest.java index 2640732..e7ee259 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/filefinder/FullPathWildCardFileFilterTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/FullPathWildCardFileFilterTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.filefinder; +package org.hjug.dtangler.core.filefinder; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/dtangler-core/src/test/java/org/dtangler/core/filefinder/RecursiveFileFinderTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/RecursiveFileFinderTest.java similarity index 98% rename from dtangler-core/src/test/java/org/dtangler/core/filefinder/RecursiveFileFinderTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/RecursiveFileFinderTest.java index f3c63b1..b81314f 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/filefinder/RecursiveFileFinderTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/RecursiveFileFinderTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.filefinder; +package org.hjug.dtangler.core.filefinder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/dtangler-core/src/test/java/org/dtangler/core/filefinder/testdata/Bar.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/testdata/Bar.java similarity index 80% rename from dtangler-core/src/test/java/org/dtangler/core/filefinder/testdata/Bar.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/testdata/Bar.java index acb323a..685a27e 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/filefinder/testdata/Bar.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/testdata/Bar.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.filefinder.testdata; +package org.hjug.dtangler.core.filefinder.testdata; public class Bar { diff --git a/dtangler-core/src/test/java/org/dtangler/core/filefinder/testdata/Foo.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/testdata/Foo.java similarity index 80% rename from dtangler-core/src/test/java/org/dtangler/core/filefinder/testdata/Foo.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/testdata/Foo.java index 3c9afb3..29e2565 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/filefinder/testdata/Foo.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/testdata/Foo.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.filefinder.testdata; +package org.hjug.dtangler.core.filefinder.testdata; public class Foo { diff --git a/dtangler-core/src/test/java/org/dtangler/core/filefinder/testdata/sub1/Sub1Foo.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/testdata/sub1/Sub1Foo.java similarity index 79% rename from dtangler-core/src/test/java/org/dtangler/core/filefinder/testdata/sub1/Sub1Foo.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/testdata/sub1/Sub1Foo.java index e5d186c..ffbc74e 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/filefinder/testdata/sub1/Sub1Foo.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/testdata/sub1/Sub1Foo.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.filefinder.testdata.sub1; +package org.hjug.dtangler.core.filefinder.testdata.sub1; public class Sub1Foo { diff --git a/dtangler-core/src/test/java/org/dtangler/core/filefinder/testdata/sub1/sub2/Sub2Foo.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/testdata/sub1/sub2/Sub2Foo.java similarity index 77% rename from dtangler-core/src/test/java/org/dtangler/core/filefinder/testdata/sub1/sub2/Sub2Foo.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/testdata/sub1/sub2/Sub2Foo.java index 912b86e..fefbaca 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/filefinder/testdata/sub1/sub2/Sub2Foo.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/testdata/sub1/sub2/Sub2Foo.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.filefinder.testdata.sub1.sub2; +package org.hjug.dtangler.core.filefinder.testdata.sub1.sub2; public class Sub2Foo { diff --git a/dtangler-core/src/test/java/org/dtangler/core/filefinder/testdata2/Foo2.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/testdata2/Foo2.java similarity index 80% rename from dtangler-core/src/test/java/org/dtangler/core/filefinder/testdata2/Foo2.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/testdata2/Foo2.java index 7fc27c1..a7c9981 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/filefinder/testdata2/Foo2.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/filefinder/testdata2/Foo2.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.filefinder.testdata2; +package org.hjug.dtangler.core.filefinder.testdata2; public class Foo2 { diff --git a/dtangler-core/src/test/java/org/dtangler/core/input/ArgumentParserTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/input/ArgumentParserTest.java similarity index 95% rename from dtangler-core/src/test/java/org/dtangler/core/input/ArgumentParserTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/input/ArgumentParserTest.java index 9848b9b..9d48e48 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/input/ArgumentParserTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/input/ArgumentParserTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.input; +package org.hjug.dtangler.core.input; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -13,8 +13,8 @@ import java.util.List; import java.util.Map; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.ParserConstants; import org.junit.Test; public class ArgumentParserTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/input/CommandLineParserTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/input/CommandLineParserTest.java similarity index 97% rename from dtangler-core/src/test/java/org/dtangler/core/input/CommandLineParserTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/input/CommandLineParserTest.java index 82b3f93..54bf2a3 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/input/CommandLineParserTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/input/CommandLineParserTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.input; +package org.hjug.dtangler.core.input; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/dtangler-core/src/test/java/org/dtangler/core/input/ConfigFileParserTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/input/ConfigFileParserTest.java similarity index 94% rename from dtangler-core/src/test/java/org/dtangler/core/input/ConfigFileParserTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/input/ConfigFileParserTest.java index f0538b2..f771521 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/input/ConfigFileParserTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/input/ConfigFileParserTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.input; +package org.hjug.dtangler.core.input; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -15,8 +15,8 @@ import java.io.InputStream; import java.util.Map; -import org.dtangler.core.configuration.ParserConstants; -import org.dtangler.core.exception.DtException; +import org.hjug.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.exception.DtException; import org.junit.Test; public class ConfigFileParserTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/input/ConfigFileWriterTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/input/ConfigFileWriterTest.java similarity index 92% rename from dtangler-core/src/test/java/org/dtangler/core/input/ConfigFileWriterTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/input/ConfigFileWriterTest.java index c7aafea..984b56e 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/input/ConfigFileWriterTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/input/ConfigFileWriterTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.input; +package org.hjug.dtangler.core.input; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -11,10 +11,10 @@ import java.io.File; import java.util.*; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.Group; -import org.dtangler.core.configuration.ParserConstants; -import org.dtangler.core.testutil.ClassPathEntryFinder; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.testutil.ClassPathEntryFinder; import org.junit.Test; public class ConfigFileWriterTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/input/GroupArgumentParserTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/input/GroupArgumentParserTest.java similarity index 94% rename from dtangler-core/src/test/java/org/dtangler/core/input/GroupArgumentParserTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/input/GroupArgumentParserTest.java index b5fed75..ee1bc2a 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/input/GroupArgumentParserTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/input/GroupArgumentParserTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.input; +package org.hjug.dtangler.core.input; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -15,9 +15,9 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.Group; -import org.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.core.configuration.ParserConstants; import org.junit.Test; public class GroupArgumentParserTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/input/RuleParserTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/input/RuleParserTest.java similarity index 95% rename from dtangler-core/src/test/java/org/dtangler/core/input/RuleParserTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/input/RuleParserTest.java index cd4af68..63e8510 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/input/RuleParserTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/input/RuleParserTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.input; +package org.hjug.dtangler.core.input; import static org.junit.Assert.assertEquals; @@ -13,8 +13,8 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.ParserConstants; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-core/src/test/java/org/dtangler/core/input/WildcardMatchTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/input/WildcardMatchTest.java similarity index 95% rename from dtangler-core/src/test/java/org/dtangler/core/input/WildcardMatchTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/input/WildcardMatchTest.java index ad923b9..7140ac6 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/input/WildcardMatchTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/input/WildcardMatchTest.java @@ -3,12 +3,12 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.input; +package org.hjug.dtangler.core.input; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.dtangler.core.util.WildcardMatch; +import org.hjug.dtangler.core.util.WildcardMatch; import org.junit.Test; public class WildcardMatchTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/ruleanalysis/ForbiddenDependencyFinderTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/ruleanalysis/ForbiddenDependencyFinderTest.java similarity index 96% rename from dtangler-core/src/test/java/org/dtangler/core/ruleanalysis/ForbiddenDependencyFinderTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/ruleanalysis/ForbiddenDependencyFinderTest.java index 79e3ecb..1ea3853 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/ruleanalysis/ForbiddenDependencyFinderTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/ruleanalysis/ForbiddenDependencyFinderTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.ruleanalysis; +package org.hjug.dtangler.core.ruleanalysis; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -15,14 +15,14 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.configuration.Group; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Dependency; -import org.dtangler.core.dependencies.TestDependable; -import org.dtangler.core.dependencies.TestScope; -import org.dtangler.core.ruleanalysis.Rule.Type; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.dependencies.TestScope; +import org.hjug.dtangler.core.ruleanalysis.Rule.Type; import org.junit.Test; public class ForbiddenDependencyFinderTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/ruleanalysis/GroupRuleMemberTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/ruleanalysis/GroupRuleMemberTest.java similarity index 88% rename from dtangler-core/src/test/java/org/dtangler/core/ruleanalysis/GroupRuleMemberTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/ruleanalysis/GroupRuleMemberTest.java index 7d12594..7068674 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/ruleanalysis/GroupRuleMemberTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/ruleanalysis/GroupRuleMemberTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.ruleanalysis; +package org.hjug.dtangler.core.ruleanalysis; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -11,8 +11,8 @@ import java.util.HashSet; import java.util.Set; -import org.dtangler.core.configuration.Group; -import org.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.core.dependencies.TestDependable; import org.junit.Test; public class GroupRuleMemberTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/ruleanalysis/RuleCreatorTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/ruleanalysis/RuleCreatorTest.java similarity index 93% rename from dtangler-core/src/test/java/org/dtangler/core/ruleanalysis/RuleCreatorTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/ruleanalysis/RuleCreatorTest.java index 840da03..d0b24a3 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/ruleanalysis/RuleCreatorTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/ruleanalysis/RuleCreatorTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.ruleanalysis; +package org.hjug.dtangler.core.ruleanalysis; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -14,12 +14,12 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.configuration.Group; -import org.dtangler.core.configuration.ParserConstants; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.DependencyGraph; -import org.dtangler.core.exception.DtException; -import org.dtangler.core.testutil.dependenciesbuilder.DependencyGraphBuilder; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.core.exception.DtException; +import org.hjug.dtangler.core.testutil.dependenciesbuilder.DependencyGraphBuilder; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-core/src/test/java/org/dtangler/core/ruleanalysis/RuleTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/ruleanalysis/RuleTest.java similarity index 92% rename from dtangler-core/src/test/java/org/dtangler/core/ruleanalysis/RuleTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/ruleanalysis/RuleTest.java index c493a13..8951ce6 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/ruleanalysis/RuleTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/ruleanalysis/RuleTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.ruleanalysis; +package org.hjug.dtangler.core.ruleanalysis; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -12,9 +12,9 @@ import java.util.HashSet; import java.util.Set; -import org.dtangler.core.configuration.Group; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.TestDependable; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-core/src/test/java/org/dtangler/core/ruleanalysis/RuleViolationTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/ruleanalysis/RuleViolationTest.java similarity index 88% rename from dtangler-core/src/test/java/org/dtangler/core/ruleanalysis/RuleViolationTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/ruleanalysis/RuleViolationTest.java index 89ad03b..1c0a44b 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/ruleanalysis/RuleViolationTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/ruleanalysis/RuleViolationTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.ruleanalysis; +package org.hjug.dtangler.core.ruleanalysis; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -14,10 +14,10 @@ import java.util.HashSet; import java.util.Set; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.dependencies.Dependency; -import org.dtangler.core.dependencies.TestDependable; -import org.dtangler.core.testutil.ruleanalysis.MockRule; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.testutil.ruleanalysis.MockRule; import org.junit.Test; public class RuleViolationTest { diff --git a/dtangler-core/src/test/java/org/dtangler/core/testutil/ClassPathEntryFinder.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/ClassPathEntryFinder.java similarity index 95% rename from dtangler-core/src/test/java/org/dtangler/core/testutil/ClassPathEntryFinder.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/ClassPathEntryFinder.java index b29baf7..2855635 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/testutil/ClassPathEntryFinder.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/ClassPathEntryFinder.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.testutil; +package org.hjug.dtangler.core.testutil; import java.io.File; import java.io.IOException; diff --git a/dtangler-core/src/test/java/org/dtangler/core/testutil/dependenciesbuilder/DependenciesBuilder.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/dependenciesbuilder/DependenciesBuilder.java similarity index 79% rename from dtangler-core/src/test/java/org/dtangler/core/testutil/dependenciesbuilder/DependenciesBuilder.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/dependenciesbuilder/DependenciesBuilder.java index 9778abc..762754c 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/testutil/dependenciesbuilder/DependenciesBuilder.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/dependenciesbuilder/DependenciesBuilder.java @@ -3,14 +3,14 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.testutil.dependenciesbuilder; +package org.hjug.dtangler.core.testutil.dependenciesbuilder; import java.util.HashMap; import java.util.Map; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.DependencyGraph; public class DependenciesBuilder { private final Dependencies deps = new Dependencies(); diff --git a/dtangler-core/src/test/java/org/dtangler/core/testutil/dsmdriver/DsmCellDriver.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/dsmdriver/DsmCellDriver.java similarity index 80% rename from dtangler-core/src/test/java/org/dtangler/core/testutil/dsmdriver/DsmCellDriver.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/dsmdriver/DsmCellDriver.java index 2e1ebb9..225e4cf 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/testutil/dsmdriver/DsmCellDriver.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/dsmdriver/DsmCellDriver.java @@ -3,9 +3,9 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.testutil.dsmdriver; +package org.hjug.dtangler.core.testutil.dsmdriver; -import org.dtangler.core.dsm.DsmCell; +import org.hjug.dtangler.core.dsm.DsmCell; public class DsmCellDriver { diff --git a/dtangler-core/src/test/java/org/dtangler/core/testutil/dsmdriver/DsmDriver.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/dsmdriver/DsmDriver.java similarity index 88% rename from dtangler-core/src/test/java/org/dtangler/core/testutil/dsmdriver/DsmDriver.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/dsmdriver/DsmDriver.java index 596a04b..a8308b0 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/testutil/dsmdriver/DsmDriver.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/dsmdriver/DsmDriver.java @@ -3,15 +3,15 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.testutil.dsmdriver; +package org.hjug.dtangler.core.testutil.dsmdriver; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.dtangler.core.dsm.Dsm; -import org.dtangler.core.dsm.DsmRow; +import org.hjug.dtangler.core.dsm.Dsm; +import org.hjug.dtangler.core.dsm.DsmRow; public class DsmDriver { diff --git a/dtangler-core/src/test/java/org/dtangler/core/testutil/dsmdriver/DsmRowDriver.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/dsmdriver/DsmRowDriver.java similarity index 88% rename from dtangler-core/src/test/java/org/dtangler/core/testutil/dsmdriver/DsmRowDriver.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/dsmdriver/DsmRowDriver.java index 9692fbc..d0cfd46 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/testutil/dsmdriver/DsmRowDriver.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/dsmdriver/DsmRowDriver.java @@ -3,11 +3,11 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.testutil.dsmdriver; +package org.hjug.dtangler.core.testutil.dsmdriver; import java.util.Map; -import org.dtangler.core.dsm.DsmRow; +import org.hjug.dtangler.core.dsm.DsmRow; public class DsmRowDriver { diff --git a/dtangler-core/src/test/java/org/dtangler/core/testutil/output/FileUtil.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/output/FileUtil.java similarity index 96% rename from dtangler-core/src/test/java/org/dtangler/core/testutil/output/FileUtil.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/output/FileUtil.java index bdf2a41..754804f 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/testutil/output/FileUtil.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/output/FileUtil.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.testutil.output; +package org.hjug.dtangler.core.testutil.output; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; diff --git a/dtangler-core/src/test/java/org/dtangler/core/testutil/output/MockWriter.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/output/MockWriter.java similarity index 86% rename from dtangler-core/src/test/java/org/dtangler/core/testutil/output/MockWriter.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/output/MockWriter.java index 1e75bc5..8347dac 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/testutil/output/MockWriter.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/output/MockWriter.java @@ -3,9 +3,9 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.testutil.output; +package org.hjug.dtangler.core.testutil.output; -import org.dtangler.core.textui.Writer; +import org.hjug.dtangler.core.textui.Writer; public class MockWriter implements Writer { private static final String LINE_SEPARATOR = System.getProperty("line.separator"); diff --git a/dtangler-core/src/test/java/org/dtangler/core/testutil/ruleanalysis/MockRule.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/ruleanalysis/MockRule.java similarity index 78% rename from dtangler-core/src/test/java/org/dtangler/core/testutil/ruleanalysis/MockRule.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/ruleanalysis/MockRule.java index c5a7e0a..bfd3e51 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/testutil/ruleanalysis/MockRule.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/ruleanalysis/MockRule.java @@ -3,18 +3,18 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.testutil.ruleanalysis; +package org.hjug.dtangler.core.testutil.ruleanalysis; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.dtangler.core.configuration.Group; -import org.dtangler.core.ruleanalysis.GroupRuleMember; -import org.dtangler.core.ruleanalysis.Rule; -import org.dtangler.core.ruleanalysis.RuleMember; -import org.dtangler.core.ruleanalysis.SingleRuleMember; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.core.ruleanalysis.GroupRuleMember; +import org.hjug.dtangler.core.ruleanalysis.Rule; +import org.hjug.dtangler.core.ruleanalysis.RuleMember; +import org.hjug.dtangler.core.ruleanalysis.SingleRuleMember; public class MockRule extends Rule { diff --git a/dtangler-core/src/test/java/org/dtangler/core/testutil/ruleanalysis/MockRuleViolation.java b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/ruleanalysis/MockRuleViolation.java similarity index 60% rename from dtangler-core/src/test/java/org/dtangler/core/testutil/ruleanalysis/MockRuleViolation.java rename to dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/ruleanalysis/MockRuleViolation.java index 28ca35a..e59c5ab 100644 --- a/dtangler-core/src/test/java/org/dtangler/core/testutil/ruleanalysis/MockRuleViolation.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/core/testutil/ruleanalysis/MockRuleViolation.java @@ -3,12 +3,12 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.testutil.ruleanalysis; +package org.hjug.dtangler.core.testutil.ruleanalysis; -import org.dtangler.core.dependencies.Dependency; -import org.dtangler.core.dependencies.TestDependable; -import org.dtangler.core.ruleanalysis.Rule; -import org.dtangler.core.ruleanalysis.RuleViolation; +import org.hjug.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.ruleanalysis.Rule; +import org.hjug.dtangler.core.ruleanalysis.RuleViolation; public class MockRuleViolation extends RuleViolation { public MockRuleViolation(String dependant, String dependee, Rule rule) { diff --git a/dtangler-core/src/test/java/org/dtangler/genericengine/dependenciesstreamparser/ItemDependenciesStreamParserTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/genericengine/dependenciesstreamparser/ItemDependenciesStreamParserTest.java similarity index 93% rename from dtangler-core/src/test/java/org/dtangler/genericengine/dependenciesstreamparser/ItemDependenciesStreamParserTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/genericengine/dependenciesstreamparser/ItemDependenciesStreamParserTest.java index e71863b..46b098b 100644 --- a/dtangler-core/src/test/java/org/dtangler/genericengine/dependenciesstreamparser/ItemDependenciesStreamParserTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/genericengine/dependenciesstreamparser/ItemDependenciesStreamParserTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.genericengine.dependenciesstreamparser; +package org.hjug.dtangler.genericengine.dependenciesstreamparser; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -11,10 +11,10 @@ import java.io.File; import java.util.*; -import org.dtangler.core.exception.DtException; -import org.dtangler.core.testutil.ClassPathEntryFinder; -import org.dtangler.genericengine.types.Item; -import org.dtangler.genericengine.types.ValidScopes; +import org.hjug.dtangler.core.exception.DtException; +import org.hjug.dtangler.core.testutil.ClassPathEntryFinder; +import org.hjug.dtangler.genericengine.types.Item; +import org.hjug.dtangler.genericengine.types.ValidScopes; import org.junit.Test; public class ItemDependenciesStreamParserTest { @@ -23,7 +23,7 @@ public class ItemDependenciesStreamParserTest { public void testScope0Parser() { String corePath = ClassPathEntryFinder.getPathContaining("core"); String dtPath = corePath - + "/org/dtangler/genericengine/dependencyengine/testdata/testParsing1.dt"; + + "/org/hjug/dtangler/genericengine/dependencyengine/testdata/testParsing1.dt"; ItemDependenciesStreamParser parser = new ItemDependenciesStreamParser(); ValidScopes validScopes = new ValidScopes(); Set items = parser.parse(validScopes, diff --git a/dtangler-core/src/test/java/org/dtangler/genericengine/dependencyengine/GenericDependencyEngineTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/genericengine/dependencyengine/GenericDependencyEngineTest.java similarity index 75% rename from dtangler-core/src/test/java/org/dtangler/genericengine/dependencyengine/GenericDependencyEngineTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/genericengine/dependencyengine/GenericDependencyEngineTest.java index 5e30ef6..b2ec20c 100644 --- a/dtangler-core/src/test/java/org/dtangler/genericengine/dependencyengine/GenericDependencyEngineTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/genericengine/dependencyengine/GenericDependencyEngineTest.java @@ -3,18 +3,18 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.genericengine.dependencyengine; +package org.hjug.dtangler.genericengine.dependencyengine; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.*; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.DependencyGraph; -import org.dtangler.core.testutil.ClassPathEntryFinder; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.core.testutil.ClassPathEntryFinder; import org.junit.Test; public class GenericDependencyEngineTest { @@ -24,7 +24,7 @@ public void testDependencies() { String corePath = ClassPathEntryFinder.getPathContaining("core"); String dtPath = corePath - + "/org/dtangler/genericengine/dependencyengine/testdata/test.dt"; + + "/org/hjug/dtangler/genericengine/dependencyengine/testdata/test.dt"; Arguments args = new Arguments(); args.setInput(Collections.singletonList(dtPath)); GenericDependencyEngine engine = new GenericDependencyEngine(); diff --git a/dtangler-core/src/test/java/org/dtangler/genericengine/dependencyengine/ItemDependencyBuilderTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/genericengine/dependencyengine/ItemDependencyBuilderTest.java similarity index 95% rename from dtangler-core/src/test/java/org/dtangler/genericengine/dependencyengine/ItemDependencyBuilderTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/genericengine/dependencyengine/ItemDependencyBuilderTest.java index f188b29..0fa85b6 100644 --- a/dtangler-core/src/test/java/org/dtangler/genericengine/dependencyengine/ItemDependencyBuilderTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/genericengine/dependencyengine/ItemDependencyBuilderTest.java @@ -1,4 +1,4 @@ -package org.dtangler.genericengine.dependencyengine; +package org.hjug.dtangler.genericengine.dependencyengine; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -7,14 +7,14 @@ import java.io.File; import java.util.*; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.DependencyGraph; -import org.dtangler.core.testutil.ClassPathEntryFinder; -import org.dtangler.genericengine.dependenciesstreamparser.ItemDependenciesStreamParser; -import org.dtangler.genericengine.types.Item; -import org.dtangler.genericengine.types.ItemScope; -import org.dtangler.genericengine.types.ValidScopes; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.core.testutil.ClassPathEntryFinder; +import org.hjug.dtangler.genericengine.dependenciesstreamparser.ItemDependenciesStreamParser; +import org.hjug.dtangler.genericengine.types.Item; +import org.hjug.dtangler.genericengine.types.ItemScope; +import org.hjug.dtangler.genericengine.types.ValidScopes; import org.junit.Test; public class ItemDependencyBuilderTest { @@ -63,7 +63,7 @@ public void testBuilder() { public void testScopes() { String corePath = ClassPathEntryFinder.getPathContaining("core"); String dtPath = corePath - + "/org/dtangler/genericengine/dependencyengine/testdata/testParsing4.dt"; + + "/org/hjug/dtangler/genericengine/dependencyengine/testdata/testParsing4.dt"; ItemDependenciesStreamParser parser = new ItemDependenciesStreamParser(); ValidScopes validScopes = new ValidScopes(); Set items = parser.parse(validScopes, new File(dtPath), @@ -91,7 +91,7 @@ public void testScopes() { public void testJavaFullyqualifiedNames() { String corePath = ClassPathEntryFinder.getPathContaining("core"); String dtPath = corePath - + "/org/dtangler/genericengine/dependencyengine/testdata/testJavafullyqualifiednames.dt"; + + "/org/hjug/dtangler/genericengine/dependencyengine/testdata/testJavafullyqualifiednames.dt"; ItemDependenciesStreamParser parser = new ItemDependenciesStreamParser(); ValidScopes validScopes = new ValidScopes(); Set items = parser.parse(validScopes, new File(dtPath), @@ -222,7 +222,7 @@ public void testJavaFullyqualifiedNames() { public void testScope2Builder() { String corePath = ClassPathEntryFinder.getPathContaining("core"); String dtPath = corePath - + "/org/dtangler/genericengine/dependencyengine/testdata/testParsing2.dt"; + + "/org/hjug/dtangler/genericengine/dependencyengine/testdata/testParsing2.dt"; testABCBasics(dtPath); } @@ -230,7 +230,7 @@ public void testScope2Builder() { public void testScope2DependencyWeightsBuilder() { String corePath = ClassPathEntryFinder.getPathContaining("core"); String dtPath = corePath - + "/org/dtangler/genericengine/dependencyengine/testdata/testParsing3.dt"; + + "/org/hjug/dtangler/genericengine/dependencyengine/testdata/testParsing3.dt"; Dependencies dependencies = testABCBasics(dtPath); DependencyGraph dependencyGraphScope1 = dependencies .getDependencyGraph(new ItemScope("1", 1)); diff --git a/dtangler-core/src/test/java/org/dtangler/genericengine/types/ItemTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/genericengine/types/ItemTest.java similarity index 98% rename from dtangler-core/src/test/java/org/dtangler/genericengine/types/ItemTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/genericengine/types/ItemTest.java index f68c47a..2095ec0 100644 --- a/dtangler-core/src/test/java/org/dtangler/genericengine/types/ItemTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/genericengine/types/ItemTest.java @@ -1,4 +1,4 @@ -package org.dtangler.genericengine.types; +package org.hjug.dtangler.genericengine.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -6,7 +6,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.dtangler.genericengine.types.Item; +import org.hjug.dtangler.genericengine.types.Item; import org.junit.Test; public class ItemTest { diff --git a/dtangler-core/src/test/java/org/dtangler/javaengine/classfileparser/ClassFileParserTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/javaengine/classfileparser/ClassFileParserTest.java similarity index 91% rename from dtangler-core/src/test/java/org/dtangler/javaengine/classfileparser/ClassFileParserTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/javaengine/classfileparser/ClassFileParserTest.java index 912d4bb..95c4061 100644 --- a/dtangler-core/src/test/java/org/dtangler/javaengine/classfileparser/ClassFileParserTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/javaengine/classfileparser/ClassFileParserTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser; +package org.hjug.dtangler.javaengine.classfileparser; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -16,10 +16,10 @@ import java.io.InputStream; import java.util.Set; -import org.dtangler.core.testutil.ClassPathEntryFinder; -import org.dtangler.core.testutil.output.FileUtil; -import org.dtangler.javaengine.jarfileparser.JarFileParser; -import org.dtangler.javaengine.types.JavaClass; +import org.hjug.dtangler.core.testutil.ClassPathEntryFinder; +import org.hjug.dtangler.core.testutil.output.FileUtil; +import org.hjug.dtangler.javaengine.jarfileparser.JarFileParser; +import org.hjug.dtangler.javaengine.types.JavaClass; import org.junit.Test; public class ClassFileParserTest { @@ -35,9 +35,9 @@ public void testParseJava9ModuleInfo() { @Test public void testParseJava9Class() { - JavaClass result = parseJava9Class("org/dtangler/javaengine/classfileparser", "SimpleJava9Class.class"); + JavaClass result = parseJava9Class("org/hjug/dtangler/javaengine/classfileparser", "SimpleJava9Class.class"); assertEquals("SimpleJava9Class", result.getName()); - assertEquals("org.dtangler.javaengine.classfileparser", result.getPackage()); + assertEquals("org.hjug.dtangler.javaengine.classfileparser", result.getPackage()); } private JavaClass parseJava9Class(String path, String className) { @@ -70,7 +70,7 @@ public void testGetClassName() { } private String getTestDataPackage() { - return "org.dtangler.javaengine.classfileparser.testdata"; + return "org.hjug.dtangler.javaengine.classfileparser.testdata"; } @Test diff --git a/dtangler-core/src/test/java/org/dtangler/javaengine/classfileparser/testdata/TextFile.txt b/dtangler-core/src/test/java/org/hjug/dtangler/javaengine/classfileparser/testdata/TextFile.txt similarity index 100% rename from dtangler-core/src/test/java/org/dtangler/javaengine/classfileparser/testdata/TextFile.txt rename to dtangler-core/src/test/java/org/hjug/dtangler/javaengine/classfileparser/testdata/TextFile.txt diff --git a/dtangler-core/src/test/java/org/dtangler/javaengine/dependencyengine/ClassDependenciesTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/javaengine/dependencyengine/ClassDependenciesTest.java similarity index 94% rename from dtangler-core/src/test/java/org/dtangler/javaengine/dependencyengine/ClassDependenciesTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/javaengine/dependencyengine/ClassDependenciesTest.java index 53a472e..7cd76d5 100644 --- a/dtangler-core/src/test/java/org/dtangler/javaengine/dependencyengine/ClassDependenciesTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/javaengine/dependencyengine/ClassDependenciesTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.dependencyengine; +package org.hjug.dtangler.javaengine.dependencyengine; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -11,10 +11,10 @@ import java.util.HashSet; import java.util.Set; -import org.dtangler.core.dependencies.DependencyGraph; -import org.dtangler.javaengine.dependencyengine.ClassDependencies; -import org.dtangler.javaengine.types.JavaClass; -import org.dtangler.javaengine.types.JavaScope; +import org.hjug.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.javaengine.dependencyengine.ClassDependencies; +import org.hjug.dtangler.javaengine.types.JavaClass; +import org.hjug.dtangler.javaengine.types.JavaScope; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-core/src/test/java/org/dtangler/javaengine/dependencyengine/JavaDependencyEngineTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/javaengine/dependencyengine/JavaDependencyEngineTest.java similarity index 86% rename from dtangler-core/src/test/java/org/dtangler/javaengine/dependencyengine/JavaDependencyEngineTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/javaengine/dependencyengine/JavaDependencyEngineTest.java index 6520f98..6eed710 100644 --- a/dtangler-core/src/test/java/org/dtangler/javaengine/dependencyengine/JavaDependencyEngineTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/javaengine/dependencyengine/JavaDependencyEngineTest.java @@ -3,19 +3,19 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.dependencyengine; +package org.hjug.dtangler.javaengine.dependencyengine; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.*; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.DependencyGraph; -import org.dtangler.core.testutil.ClassPathEntryFinder; -import org.dtangler.javaengine.types.JavaScope; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.core.testutil.ClassPathEntryFinder; +import org.hjug.dtangler.javaengine.types.JavaScope; import org.junit.Test; public class JavaDependencyEngineTest { @@ -30,7 +30,7 @@ public class JavaDependencyEngineTest { @Test public void testGetJarDependencies() { String path = ClassPathEntryFinder.getPathContaining("core") - + "/org/dtangler/core/acceptancetests/testdata/jarexample.jar"; + + "/org/hjug/dtangler/core/acceptancetests/testdata/jarexample.jar"; Arguments args = new Arguments(); args.setInput(Collections.singletonList(path)); diff --git a/dtangler-core/src/test/java/org/dtangler/javaengine/dependencyengine/LocationDependenciesTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/javaengine/dependencyengine/LocationDependenciesTest.java similarity index 84% rename from dtangler-core/src/test/java/org/dtangler/javaengine/dependencyengine/LocationDependenciesTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/javaengine/dependencyengine/LocationDependenciesTest.java index a0791d9..e8fb731 100644 --- a/dtangler-core/src/test/java/org/dtangler/javaengine/dependencyengine/LocationDependenciesTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/javaengine/dependencyengine/LocationDependenciesTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.dependencyengine; +package org.hjug.dtangler.javaengine.dependencyengine; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -11,12 +11,12 @@ import java.util.HashSet; import java.util.Set; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.DependencyGraph; -import org.dtangler.javaengine.dependencyengine.ClassDependencies; -import org.dtangler.javaengine.types.JavaClass; -import org.dtangler.javaengine.types.JavaScope; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.javaengine.dependencyengine.ClassDependencies; +import org.hjug.dtangler.javaengine.types.JavaClass; +import org.hjug.dtangler.javaengine.types.JavaScope; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-core/src/test/java/org/dtangler/javaengine/dependencyengine/PackageDependenciesTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/javaengine/dependencyengine/PackageDependenciesTest.java similarity index 86% rename from dtangler-core/src/test/java/org/dtangler/javaengine/dependencyengine/PackageDependenciesTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/javaengine/dependencyengine/PackageDependenciesTest.java index 535c25b..2f97517 100644 --- a/dtangler-core/src/test/java/org/dtangler/javaengine/dependencyengine/PackageDependenciesTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/javaengine/dependencyengine/PackageDependenciesTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.dependencyengine; +package org.hjug.dtangler.javaengine.dependencyengine; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -11,11 +11,11 @@ import java.util.HashSet; import java.util.Set; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.DependencyGraph; -import org.dtangler.javaengine.dependencyengine.ClassDependencies; -import org.dtangler.javaengine.types.JavaClass; -import org.dtangler.javaengine.types.JavaScope; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.javaengine.dependencyengine.ClassDependencies; +import org.hjug.dtangler.javaengine.types.JavaClass; +import org.hjug.dtangler.javaengine.types.JavaScope; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-core/src/test/java/org/dtangler/javaengine/jarfileparser/JarFileParserTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/javaengine/jarfileparser/JarFileParserTest.java similarity index 77% rename from dtangler-core/src/test/java/org/dtangler/javaengine/jarfileparser/JarFileParserTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/javaengine/jarfileparser/JarFileParserTest.java index e474b51..1778d17 100644 --- a/dtangler-core/src/test/java/org/dtangler/javaengine/jarfileparser/JarFileParserTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/javaengine/jarfileparser/JarFileParserTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.jarfileparser; +package org.hjug.dtangler.javaengine.jarfileparser; import static org.junit.Assert.assertEquals; @@ -14,11 +14,11 @@ import java.util.HashSet; import java.util.Set; -import org.dtangler.core.filefinder.FullPathWildCardFileFilter; -import org.dtangler.core.filefinder.RecursiveFileFinder; -import org.dtangler.core.testutil.ClassPathEntryFinder; -import org.dtangler.javaengine.classfileparser.ClassFileParser; -import org.dtangler.javaengine.types.JavaClass; +import org.hjug.dtangler.core.filefinder.FullPathWildCardFileFilter; +import org.hjug.dtangler.core.filefinder.RecursiveFileFinder; +import org.hjug.dtangler.core.testutil.ClassPathEntryFinder; +import org.hjug.dtangler.javaengine.classfileparser.ClassFileParser; +import org.hjug.dtangler.javaengine.types.JavaClass; import org.junit.Test; public class JarFileParserTest { @@ -29,14 +29,14 @@ public void testClassesFromJarFileEqualClassesFromClassFiles() String corePath = ClassPathEntryFinder.getPathContaining("core"); String jarPath = corePath - + "/org/dtangler/javaengine/jarfileparser/testdata/testdata.jar"; + + "/org/hjug/dtangler/javaengine/jarfileparser/testdata/testdata.jar"; String testClassesPath = ClassPathEntryFinder.getPathContaining("testdata-java"); String expectedClasses = testClassesPath; if(!testClassesPath.endsWith(".jar")) { expectedClasses = testClassesPath - + "/org/dtangler/javaengine/classfileparser/testdata"; + + "/org/hjug/dtangler/javaengine/classfileparser/testdata"; } Set jarClasses = new JarFileParser() diff --git a/dtangler-core/src/test/java/org/dtangler/javaengine/types/JavaClassTest.java b/dtangler-core/src/test/java/org/hjug/dtangler/javaengine/types/JavaClassTest.java similarity index 95% rename from dtangler-core/src/test/java/org/dtangler/javaengine/types/JavaClassTest.java rename to dtangler-core/src/test/java/org/hjug/dtangler/javaengine/types/JavaClassTest.java index 4b18445..f10ebbb 100644 --- a/dtangler-core/src/test/java/org/dtangler/javaengine/types/JavaClassTest.java +++ b/dtangler-core/src/test/java/org/hjug/dtangler/javaengine/types/JavaClassTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.types; +package org.hjug.dtangler.javaengine.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -11,7 +11,7 @@ import java.util.Map; -import org.dtangler.javaengine.types.JavaClass; +import org.hjug.dtangler.javaengine.types.JavaClass; import org.junit.Test; public class JavaClassTest { diff --git a/dtangler-core/src/test/resources/org/dtangler/javaengine/jarfileparser/testdata/testdata.jar b/dtangler-core/src/test/resources/org/dtangler/javaengine/jarfileparser/testdata/testdata.jar deleted file mode 100644 index bb8888e..0000000 Binary files a/dtangler-core/src/test/resources/org/dtangler/javaengine/jarfileparser/testdata/testdata.jar and /dev/null differ diff --git a/dtangler-core/src/test/resources/org/dtangler/core/acceptancetests/input/dependencies.dt b/dtangler-core/src/test/resources/org/hjug/dtangler/core/acceptancetests/input/dependencies.dt similarity index 100% rename from dtangler-core/src/test/resources/org/dtangler/core/acceptancetests/input/dependencies.dt rename to dtangler-core/src/test/resources/org/hjug/dtangler/core/acceptancetests/input/dependencies.dt diff --git a/dtangler-core/src/test/resources/org/dtangler/core/acceptancetests/input/exampleConfig.properties b/dtangler-core/src/test/resources/org/hjug/dtangler/core/acceptancetests/input/exampleConfig.properties similarity index 100% rename from dtangler-core/src/test/resources/org/dtangler/core/acceptancetests/input/exampleConfig.properties rename to dtangler-core/src/test/resources/org/hjug/dtangler/core/acceptancetests/input/exampleConfig.properties diff --git a/dtangler-core/src/test/resources/org/dtangler/core/acceptancetests/testdata/jarexample.jar b/dtangler-core/src/test/resources/org/hjug/dtangler/core/acceptancetests/testdata/jarexample.jar similarity index 100% rename from dtangler-core/src/test/resources/org/dtangler/core/acceptancetests/testdata/jarexample.jar rename to dtangler-core/src/test/resources/org/hjug/dtangler/core/acceptancetests/testdata/jarexample.jar diff --git a/dtangler-core/src/test/resources/org/dtangler/core/filefinder/testdata/Text.txt b/dtangler-core/src/test/resources/org/hjug/dtangler/core/filefinder/testdata/Text.txt similarity index 100% rename from dtangler-core/src/test/resources/org/dtangler/core/filefinder/testdata/Text.txt rename to dtangler-core/src/test/resources/org/hjug/dtangler/core/filefinder/testdata/Text.txt diff --git a/dtangler-core/src/test/resources/org/dtangler/core/filefinder/testdata/sub1/sub2/Sub2.txt b/dtangler-core/src/test/resources/org/hjug/dtangler/core/filefinder/testdata/sub1/sub2/Sub2.txt similarity index 100% rename from dtangler-core/src/test/resources/org/dtangler/core/filefinder/testdata/sub1/sub2/Sub2.txt rename to dtangler-core/src/test/resources/org/hjug/dtangler/core/filefinder/testdata/sub1/sub2/Sub2.txt diff --git a/dtangler-core/src/test/resources/org/dtangler/core/input/testdata/TestConfig1.properties b/dtangler-core/src/test/resources/org/hjug/dtangler/core/input/testdata/TestConfig1.properties similarity index 100% rename from dtangler-core/src/test/resources/org/dtangler/core/input/testdata/TestConfig1.properties rename to dtangler-core/src/test/resources/org/hjug/dtangler/core/input/testdata/TestConfig1.properties diff --git a/dtangler-core/src/test/resources/org/dtangler/core/input/testdata/TestConfig2.properties b/dtangler-core/src/test/resources/org/hjug/dtangler/core/input/testdata/TestConfig2.properties similarity index 100% rename from dtangler-core/src/test/resources/org/dtangler/core/input/testdata/TestConfig2.properties rename to dtangler-core/src/test/resources/org/hjug/dtangler/core/input/testdata/TestConfig2.properties diff --git a/dtangler-core/src/test/resources/org/dtangler/genericengine/dependencyengine/testdata/test.dt b/dtangler-core/src/test/resources/org/hjug/dtangler/genericengine/dependencyengine/testdata/test.dt similarity index 100% rename from dtangler-core/src/test/resources/org/dtangler/genericengine/dependencyengine/testdata/test.dt rename to dtangler-core/src/test/resources/org/hjug/dtangler/genericengine/dependencyengine/testdata/test.dt diff --git a/dtangler-core/src/test/resources/org/dtangler/genericengine/dependencyengine/testdata/testJavafullyqualifiednames.dt b/dtangler-core/src/test/resources/org/hjug/dtangler/genericengine/dependencyengine/testdata/testJavafullyqualifiednames.dt similarity index 100% rename from dtangler-core/src/test/resources/org/dtangler/genericengine/dependencyengine/testdata/testJavafullyqualifiednames.dt rename to dtangler-core/src/test/resources/org/hjug/dtangler/genericengine/dependencyengine/testdata/testJavafullyqualifiednames.dt diff --git a/dtangler-core/src/test/resources/org/dtangler/genericengine/dependencyengine/testdata/testParsing1.dt b/dtangler-core/src/test/resources/org/hjug/dtangler/genericengine/dependencyengine/testdata/testParsing1.dt similarity index 100% rename from dtangler-core/src/test/resources/org/dtangler/genericengine/dependencyengine/testdata/testParsing1.dt rename to dtangler-core/src/test/resources/org/hjug/dtangler/genericengine/dependencyengine/testdata/testParsing1.dt diff --git a/dtangler-core/src/test/resources/org/dtangler/genericengine/dependencyengine/testdata/testParsing2.dt b/dtangler-core/src/test/resources/org/hjug/dtangler/genericengine/dependencyengine/testdata/testParsing2.dt similarity index 100% rename from dtangler-core/src/test/resources/org/dtangler/genericengine/dependencyengine/testdata/testParsing2.dt rename to dtangler-core/src/test/resources/org/hjug/dtangler/genericengine/dependencyengine/testdata/testParsing2.dt diff --git a/dtangler-core/src/test/resources/org/dtangler/genericengine/dependencyengine/testdata/testParsing3.dt b/dtangler-core/src/test/resources/org/hjug/dtangler/genericengine/dependencyengine/testdata/testParsing3.dt similarity index 100% rename from dtangler-core/src/test/resources/org/dtangler/genericengine/dependencyengine/testdata/testParsing3.dt rename to dtangler-core/src/test/resources/org/hjug/dtangler/genericengine/dependencyengine/testdata/testParsing3.dt diff --git a/dtangler-core/src/test/resources/org/dtangler/genericengine/dependencyengine/testdata/testParsing4.dt b/dtangler-core/src/test/resources/org/hjug/dtangler/genericengine/dependencyengine/testdata/testParsing4.dt similarity index 100% rename from dtangler-core/src/test/resources/org/dtangler/genericengine/dependencyengine/testdata/testParsing4.dt rename to dtangler-core/src/test/resources/org/hjug/dtangler/genericengine/dependencyengine/testdata/testParsing4.dt diff --git a/dtangler-core/src/test/resources/org/hjug/dtangler/javaengine/jarfileparser/testdata/testdata.jar b/dtangler-core/src/test/resources/org/hjug/dtangler/javaengine/jarfileparser/testdata/testdata.jar new file mode 100644 index 0000000..ac0e457 Binary files /dev/null and b/dtangler-core/src/test/resources/org/hjug/dtangler/javaengine/jarfileparser/testdata/testdata.jar differ diff --git a/dtangler-domain/src/main/java/org/dtangler/core/configuration/Arguments.java b/dtangler-domain/src/main/java/org/hjug/dtangler/core/configuration/Arguments.java similarity index 99% rename from dtangler-domain/src/main/java/org/dtangler/core/configuration/Arguments.java rename to dtangler-domain/src/main/java/org/hjug/dtangler/core/configuration/Arguments.java index b581dba..7838569 100644 --- a/dtangler-domain/src/main/java/org/dtangler/core/configuration/Arguments.java +++ b/dtangler-domain/src/main/java/org/hjug/dtangler/core/configuration/Arguments.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.configuration; +package org.hjug.dtangler.core.configuration; import java.util.ArrayList; import java.util.Collections; diff --git a/dtangler-domain/src/main/java/org/dtangler/core/configuration/Group.java b/dtangler-domain/src/main/java/org/hjug/dtangler/core/configuration/Group.java similarity index 97% rename from dtangler-domain/src/main/java/org/dtangler/core/configuration/Group.java rename to dtangler-domain/src/main/java/org/hjug/dtangler/core/configuration/Group.java index d2f3e78..406c2ad 100644 --- a/dtangler-domain/src/main/java/org/dtangler/core/configuration/Group.java +++ b/dtangler-domain/src/main/java/org/hjug/dtangler/core/configuration/Group.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.configuration; +package org.hjug.dtangler.core.configuration; import java.util.Collections; import java.util.Set; diff --git a/dtangler-domain/src/main/java/org/dtangler/core/dependencies/Dependable.java b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/Dependable.java similarity index 97% rename from dtangler-domain/src/main/java/org/dtangler/core/dependencies/Dependable.java rename to dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/Dependable.java index c5621a6..04cfc6d 100644 --- a/dtangler-domain/src/main/java/org/dtangler/core/dependencies/Dependable.java +++ b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/Dependable.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencies; +package org.hjug.dtangler.core.dependencies; public class Dependable { diff --git a/dtangler-domain/src/main/java/org/dtangler/core/dependencies/Dependencies.java b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/Dependencies.java similarity index 99% rename from dtangler-domain/src/main/java/org/dtangler/core/dependencies/Dependencies.java rename to dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/Dependencies.java index 643a622..085809f 100644 --- a/dtangler-domain/src/main/java/org/dtangler/core/dependencies/Dependencies.java +++ b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/Dependencies.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencies; +package org.hjug.dtangler.core.dependencies; import java.util.ArrayList; import java.util.Collections; diff --git a/dtangler-domain/src/main/java/org/dtangler/core/dependencies/Dependency.java b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/Dependency.java similarity index 95% rename from dtangler-domain/src/main/java/org/dtangler/core/dependencies/Dependency.java rename to dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/Dependency.java index 53dcfd5..48fd58a 100644 --- a/dtangler-domain/src/main/java/org/dtangler/core/dependencies/Dependency.java +++ b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/Dependency.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencies; +package org.hjug.dtangler.core.dependencies; public class Dependency { diff --git a/dtangler-domain/src/main/java/org/dtangler/core/dependencies/DependencyGraph.java b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/DependencyGraph.java similarity index 98% rename from dtangler-domain/src/main/java/org/dtangler/core/dependencies/DependencyGraph.java rename to dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/DependencyGraph.java index 0a894b3..a9ed52d 100644 --- a/dtangler-domain/src/main/java/org/dtangler/core/dependencies/DependencyGraph.java +++ b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/DependencyGraph.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencies; +package org.hjug.dtangler.core.dependencies; import java.util.Collection; import java.util.HashMap; diff --git a/dtangler-domain/src/main/java/org/dtangler/core/dependencies/Scope.java b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/Scope.java similarity index 85% rename from dtangler-domain/src/main/java/org/dtangler/core/dependencies/Scope.java rename to dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/Scope.java index 66980d3..c6ce6e7 100644 --- a/dtangler-domain/src/main/java/org/dtangler/core/dependencies/Scope.java +++ b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/Scope.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencies; +package org.hjug.dtangler.core.dependencies; public interface Scope { diff --git a/dtangler-domain/src/main/java/org/dtangler/core/dependencies/ScopeComparator.java b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/ScopeComparator.java similarity index 88% rename from dtangler-domain/src/main/java/org/dtangler/core/dependencies/ScopeComparator.java rename to dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/ScopeComparator.java index 4ec134e..0416246 100644 --- a/dtangler-domain/src/main/java/org/dtangler/core/dependencies/ScopeComparator.java +++ b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencies/ScopeComparator.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencies; +package org.hjug.dtangler.core.dependencies; import java.util.Comparator; diff --git a/dtangler-domain/src/main/java/org/dtangler/core/dependencyengine/AbstractDependencyEngine.java b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencyengine/AbstractDependencyEngine.java similarity index 86% rename from dtangler-domain/src/main/java/org/dtangler/core/dependencyengine/AbstractDependencyEngine.java rename to dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencyengine/AbstractDependencyEngine.java index f02d346..553fb5a 100644 --- a/dtangler-domain/src/main/java/org/dtangler/core/dependencyengine/AbstractDependencyEngine.java +++ b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencyengine/AbstractDependencyEngine.java @@ -1,7 +1,7 @@ -package org.dtangler.core.dependencyengine; +package org.hjug.dtangler.core.dependencyengine; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.exception.DtException; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.exception.DtException; public abstract class AbstractDependencyEngine implements DependencyEngine { diff --git a/dtangler-domain/src/main/java/org/dtangler/core/dependencyengine/DependencyEngine.java b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencyengine/DependencyEngine.java similarity index 79% rename from dtangler-domain/src/main/java/org/dtangler/core/dependencyengine/DependencyEngine.java rename to dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencyengine/DependencyEngine.java index ebaa679..fd1cf70 100644 --- a/dtangler-domain/src/main/java/org/dtangler/core/dependencyengine/DependencyEngine.java +++ b/dtangler-domain/src/main/java/org/hjug/dtangler/core/dependencyengine/DependencyEngine.java @@ -3,12 +3,12 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencyengine; +package org.hjug.dtangler.core.dependencyengine; import java.util.List; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.dependencies.Dependencies; public interface DependencyEngine { diff --git a/dtangler-domain/src/main/java/org/dtangler/core/exception/DtException.java b/dtangler-domain/src/main/java/org/hjug/dtangler/core/exception/DtException.java similarity index 90% rename from dtangler-domain/src/main/java/org/dtangler/core/exception/DtException.java rename to dtangler-domain/src/main/java/org/hjug/dtangler/core/exception/DtException.java index 1ec91f8..99a6551 100644 --- a/dtangler-domain/src/main/java/org/dtangler/core/exception/DtException.java +++ b/dtangler-domain/src/main/java/org/hjug/dtangler/core/exception/DtException.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.exception; +package org.hjug.dtangler.core.exception; public class DtException extends RuntimeException { diff --git a/dtangler-swingui/MANIFEST.MF b/dtangler-swingui/MANIFEST.MF index bd6f76a..0bdb871 100644 --- a/dtangler-swingui/MANIFEST.MF +++ b/dtangler-swingui/MANIFEST.MF @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -Main-Class: org.dtangler.swingui.Main +Main-Class: org.hjug.dtangler.swingui.Main diff --git a/dtangler-swingui/dsmgui.bat b/dtangler-swingui/dsmgui.bat index 95c94ed..ff8be0c 100644 --- a/dtangler-swingui/dsmgui.bat +++ b/dtangler-swingui/dsmgui.bat @@ -1 +1 @@ -java -cp lib-forms\forms-1.2.0.jar;dtangler-gui.jar org.dtangler.swingui.Main %* +java -cp lib-forms\forms-1.2.0.jar;dtangler-gui.jar org.hjug.dtangler.swingui.Main %* diff --git a/dtangler-swingui/dsmgui.sh b/dtangler-swingui/dsmgui.sh index e829c2c..1a15616 100644 --- a/dtangler-swingui/dsmgui.sh +++ b/dtangler-swingui/dsmgui.sh @@ -1,3 +1,3 @@ #!/bin/sh -java -cp lib-forms\forms-1.2.0.jar:dtangler-gui.jar org.dtangler.swingui.Main +java -cp lib-forms\forms-1.2.0.jar:dtangler-gui.jar org.hjug.dtangler.swingui.Main diff --git a/dtangler-swingui/pom.xml b/dtangler-swingui/pom.xml index 6c08e8f..7493943 100644 --- a/dtangler-swingui/pom.xml +++ b/dtangler-swingui/pom.xml @@ -56,7 +56,7 @@ - org.dtangler.swingui.Main + org.hjug.dtangler.swingui.Main diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/ApplicationStarter.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/ApplicationStarter.java similarity index 55% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/ApplicationStarter.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/ApplicationStarter.java index ffb6149..9d2ed44 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/ApplicationStarter.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/ApplicationStarter.java @@ -3,29 +3,29 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui; +package org.hjug.dtangler.swingui; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.dependencyengine.DependencyEngineFactory; -import org.dtangler.core.input.ArgumentBuilder; -import org.dtangler.swingui.aboutinfodisplayer.AboutInfoDisplayer; -import org.dtangler.swingui.aboutinfodisplayer.impl.AboutInfoDisplayerImpl; -import org.dtangler.swingui.directoryselector.impl.SwingDirectorySelector; -import org.dtangler.swingui.dsm.impl.DsmViewFactoryImpl; -import org.dtangler.swingui.fileinput.impl.FileInputSelectorImpl; -import org.dtangler.swingui.fileselector.FileSelector; -import org.dtangler.swingui.fileselector.impl.SwingFileSelector; -import org.dtangler.swingui.groupselector.GroupSelector; -import org.dtangler.swingui.groupselector.impl.GroupSelectorImpl; -import org.dtangler.swingui.mainview.MainViewFactory; -import org.dtangler.swingui.mainview.impl.MainViewFactoryImpl; -import org.dtangler.swingui.rulememberselector.RuleMemberSelector; -import org.dtangler.swingui.rulememberselector.impl.RuleMemberSelectorImpl; -import org.dtangler.swingui.rulesselector.RulesSelector; -import org.dtangler.swingui.rulesselector.impl.RulesSelectorImpl; -import org.dtangler.swingui.textinput.impl.TextInputSelectorImpl; -import org.dtangler.swingui.windowmanager.DialogManager; -import org.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.dependencyengine.DependencyEngineFactory; +import org.hjug.dtangler.core.input.ArgumentBuilder; +import org.hjug.dtangler.swingui.aboutinfodisplayer.AboutInfoDisplayer; +import org.hjug.dtangler.swingui.aboutinfodisplayer.impl.AboutInfoDisplayerImpl; +import org.hjug.dtangler.swingui.directoryselector.impl.SwingDirectorySelector; +import org.hjug.dtangler.swingui.dsm.impl.DsmViewFactoryImpl; +import org.hjug.dtangler.swingui.fileinput.impl.FileInputSelectorImpl; +import org.hjug.dtangler.swingui.fileselector.FileSelector; +import org.hjug.dtangler.swingui.fileselector.impl.SwingFileSelector; +import org.hjug.dtangler.swingui.groupselector.GroupSelector; +import org.hjug.dtangler.swingui.groupselector.impl.GroupSelectorImpl; +import org.hjug.dtangler.swingui.mainview.MainViewFactory; +import org.hjug.dtangler.swingui.mainview.impl.MainViewFactoryImpl; +import org.hjug.dtangler.swingui.rulememberselector.RuleMemberSelector; +import org.hjug.dtangler.swingui.rulememberselector.impl.RuleMemberSelectorImpl; +import org.hjug.dtangler.swingui.rulesselector.RulesSelector; +import org.hjug.dtangler.swingui.rulesselector.impl.RulesSelectorImpl; +import org.hjug.dtangler.swingui.textinput.impl.TextInputSelectorImpl; +import org.hjug.dtangler.swingui.windowmanager.DialogManager; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; public class ApplicationStarter { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/Main.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/Main.java similarity index 76% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/Main.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/Main.java index af455cf..a7312d5 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/Main.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/Main.java @@ -3,10 +3,10 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui; +package org.hjug.dtangler.swingui; -import org.dtangler.swingui.windowmanager.UIExceptionHandlerDelegator; -import org.dtangler.swingui.windowmanager.impl.SwingWindowManager; +import org.hjug.dtangler.swingui.windowmanager.UIExceptionHandlerDelegator; +import org.hjug.dtangler.swingui.windowmanager.impl.SwingWindowManager; public class Main { public static void main(String[] args) { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/aboutinfodisplayer/AboutInfoDisplayer.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/aboutinfodisplayer/AboutInfoDisplayer.java similarity index 82% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/aboutinfodisplayer/AboutInfoDisplayer.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/aboutinfodisplayer/AboutInfoDisplayer.java index 83ad38a..7efdeab 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/aboutinfodisplayer/AboutInfoDisplayer.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/aboutinfodisplayer/AboutInfoDisplayer.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.aboutinfodisplayer; +package org.hjug.dtangler.swingui.aboutinfodisplayer; public interface AboutInfoDisplayer { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoDisplayerImpl.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoDisplayerImpl.java similarity index 72% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoDisplayerImpl.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoDisplayerImpl.java index a1aa0b9..1999f64 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoDisplayerImpl.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoDisplayerImpl.java @@ -3,11 +3,11 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.aboutinfodisplayer.impl; +package org.hjug.dtangler.swingui.aboutinfodisplayer.impl; -import org.dtangler.swingui.aboutinfodisplayer.AboutInfoDisplayer; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.swingui.aboutinfodisplayer.AboutInfoDisplayer; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; public class AboutInfoDisplayerImpl implements AboutInfoDisplayer { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoGlue.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoGlue.java similarity index 64% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoGlue.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoGlue.java index 12d3b43..08013bc 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoGlue.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoGlue.java @@ -3,15 +3,15 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.aboutinfodisplayer.impl; +package org.hjug.dtangler.swingui.aboutinfodisplayer.impl; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.dtangler.swingui.aboutinfodisplayer.impl.AboutInfoView.Actions; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.windowmanager.SwingView; -import org.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.swingui.aboutinfodisplayer.impl.AboutInfoView.Actions; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; public class AboutInfoGlue { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoView.java similarity index 69% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoView.java index 997035d..6eebce3 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoView.java @@ -3,9 +3,9 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.aboutinfodisplayer.impl; +package org.hjug.dtangler.swingui.aboutinfodisplayer.impl; -import org.dtangler.swingui.actionfactory.ActionKey; +import org.hjug.dtangler.swingui.actionfactory.ActionKey; public interface AboutInfoView { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/aboutinfodisplayer/impl/SwingAboutInfoView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/SwingAboutInfoView.java similarity index 93% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/aboutinfodisplayer/impl/SwingAboutInfoView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/SwingAboutInfoView.java index af4a744..9d7e2a5 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/aboutinfodisplayer/impl/SwingAboutInfoView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/SwingAboutInfoView.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.aboutinfodisplayer.impl; +package org.hjug.dtangler.swingui.aboutinfodisplayer.impl; import java.awt.Color; import java.awt.Component; @@ -15,10 +15,10 @@ import javax.swing.JLabel; import javax.swing.JPanel; -import org.dtangler.core.versioninfo.VersionInfo; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.resource.icons.IconKey; -import org.dtangler.swingui.windowmanager.SwingBaseView; +import org.hjug.dtangler.core.versioninfo.VersionInfo; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.resource.icons.IconKey; +import org.hjug.dtangler.swingui.windowmanager.SwingBaseView; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.factories.ButtonBarFactory; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/ActionExecutionListener.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/ActionExecutionListener.java similarity index 85% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/ActionExecutionListener.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/ActionExecutionListener.java index e1afc97..502d074 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/ActionExecutionListener.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/ActionExecutionListener.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.actionfactory; +package org.hjug.dtangler.swingui.actionfactory; public interface ActionExecutionListener { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/ActionFactory.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/ActionFactory.java similarity index 97% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/ActionFactory.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/ActionFactory.java index 1390e86..fd577f2 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/ActionFactory.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/ActionFactory.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.actionfactory; +package org.hjug.dtangler.swingui.actionfactory; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/ActionKey.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/ActionKey.java similarity index 82% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/ActionKey.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/ActionKey.java index b905f22..cdfffb1 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/ActionKey.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/ActionKey.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.actionfactory; +package org.hjug.dtangler.swingui.actionfactory; public interface ActionKey { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/DocumentChangeActionAdapter.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/DocumentChangeActionAdapter.java similarity index 94% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/DocumentChangeActionAdapter.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/DocumentChangeActionAdapter.java index 9ff88dd..9b99091 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/DocumentChangeActionAdapter.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/DocumentChangeActionAdapter.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.actionfactory; +package org.hjug.dtangler.swingui.actionfactory; import java.awt.event.ActionListener; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/KeyActionAdapter.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/KeyActionAdapter.java similarity index 94% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/KeyActionAdapter.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/KeyActionAdapter.java index 9889824..4e815a7 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/KeyActionAdapter.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/KeyActionAdapter.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.actionfactory; +package org.hjug.dtangler.swingui.actionfactory; import java.awt.event.ActionEvent; import java.awt.event.KeyAdapter; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/ListSelectionActionAdapter.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/ListSelectionActionAdapter.java similarity index 93% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/ListSelectionActionAdapter.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/ListSelectionActionAdapter.java index 97b91c0..a84132c 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/actionfactory/ListSelectionActionAdapter.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/actionfactory/ListSelectionActionAdapter.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.actionfactory; +package org.hjug.dtangler.swingui.actionfactory; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/directoryselector/DirectorySelector.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/directoryselector/DirectorySelector.java similarity index 88% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/directoryselector/DirectorySelector.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/directoryselector/DirectorySelector.java index e003f18..6ee6e23 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/directoryselector/DirectorySelector.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/directoryselector/DirectorySelector.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.directoryselector; +package org.hjug.dtangler.swingui.directoryselector; import java.util.List; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/directoryselector/impl/FileNameExtensionFilter.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/directoryselector/impl/FileNameExtensionFilter.java similarity index 93% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/directoryselector/impl/FileNameExtensionFilter.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/directoryselector/impl/FileNameExtensionFilter.java index ea5c130..c37cf23 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/directoryselector/impl/FileNameExtensionFilter.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/directoryselector/impl/FileNameExtensionFilter.java @@ -1,4 +1,4 @@ -package org.dtangler.swingui.directoryselector.impl; +package org.hjug.dtangler.swingui.directoryselector.impl; import java.io.File; import java.util.ArrayList; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/directoryselector/impl/SwingDirectorySelector.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/directoryselector/impl/SwingDirectorySelector.java similarity index 96% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/directoryselector/impl/SwingDirectorySelector.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/directoryselector/impl/SwingDirectorySelector.java index 47c7502..5715261 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/directoryselector/impl/SwingDirectorySelector.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/directoryselector/impl/SwingDirectorySelector.java @@ -3,14 +3,14 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.directoryselector.impl; +package org.hjug.dtangler.swingui.directoryselector.impl; import java.io.File; import java.util.List; import javax.swing.JFileChooser; -import org.dtangler.swingui.directoryselector.DirectorySelector; +import org.hjug.dtangler.swingui.directoryselector.DirectorySelector; //TODO: refactor FileSelector to support input location selection, then remove this class public class SwingDirectorySelector implements DirectorySelector { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/DsmView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/DsmView.java similarity index 95% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/DsmView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/DsmView.java index 8f41a4e..0c424e1 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/DsmView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/DsmView.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.dsm; +package org.hjug.dtangler.swingui.dsm; import javax.swing.JComponent; import javax.swing.JPopupMenu; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/DsmViewFactory.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/DsmViewFactory.java similarity index 86% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/DsmViewFactory.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/DsmViewFactory.java index b54928c..9070022 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/DsmViewFactory.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/DsmViewFactory.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.dsm; +package org.hjug.dtangler.swingui.dsm; public interface DsmViewFactory { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/SwingDsm.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/SwingDsm.java similarity index 85% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/SwingDsm.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/SwingDsm.java index 39c2270..89501c4 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/SwingDsm.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/SwingDsm.java @@ -3,9 +3,9 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.dsm; +package org.hjug.dtangler.swingui.dsm; -import org.dtangler.ui.dsm.DsmGuiModel; +import org.hjug.dtangler.ui.dsm.DsmGuiModel; public class SwingDsm { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/CellInfoTableCellRenderer.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/CellInfoTableCellRenderer.java similarity index 96% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/CellInfoTableCellRenderer.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/CellInfoTableCellRenderer.java index 18f01de..8b26572 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/CellInfoTableCellRenderer.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/CellInfoTableCellRenderer.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.dsm.impl; +package org.hjug.dtangler.swingui.dsm.impl; import java.awt.Color; import java.awt.Component; @@ -15,8 +15,8 @@ import javax.swing.border.LineBorder; import javax.swing.table.TableCellRenderer; -import org.dtangler.ui.dsm.CellInfo; -import org.dtangler.ui.dsm.NullCellInfo; +import org.hjug.dtangler.ui.dsm.CellInfo; +import org.hjug.dtangler.ui.dsm.NullCellInfo; public class CellInfoTableCellRenderer implements TableCellRenderer { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/DependableInfoColumnTableCellRenderer.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/DependableInfoColumnTableCellRenderer.java similarity index 94% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/DependableInfoColumnTableCellRenderer.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/DependableInfoColumnTableCellRenderer.java index 891d6f3..da7896a 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/DependableInfoColumnTableCellRenderer.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/DependableInfoColumnTableCellRenderer.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.dsm.impl; +package org.hjug.dtangler.swingui.dsm.impl; import java.awt.Color; import java.awt.Component; @@ -13,7 +13,7 @@ import javax.swing.SwingConstants; import javax.swing.table.TableCellRenderer; -import org.dtangler.ui.dsm.DependableInfo; +import org.hjug.dtangler.ui.dsm.DependableInfo; public class DependableInfoColumnTableCellRenderer implements TableCellRenderer { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/DependableInfoRowTableCellRenderer.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/DependableInfoRowTableCellRenderer.java similarity index 96% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/DependableInfoRowTableCellRenderer.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/DependableInfoRowTableCellRenderer.java index af81604..6ca3c22 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/DependableInfoRowTableCellRenderer.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/DependableInfoRowTableCellRenderer.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.dsm.impl; +package org.hjug.dtangler.swingui.dsm.impl; import java.awt.Color; import java.awt.Component; @@ -12,7 +12,7 @@ import javax.swing.JTable; import javax.swing.table.TableCellRenderer; -import org.dtangler.ui.dsm.DependableInfo; +import org.hjug.dtangler.ui.dsm.DependableInfo; public class DependableInfoRowTableCellRenderer implements TableCellRenderer { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/DsmPresenter.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/DsmPresenter.java similarity index 87% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/DsmPresenter.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/DsmPresenter.java index 76566e5..c0c562c 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/DsmPresenter.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/DsmPresenter.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.dsm.impl; +package org.hjug.dtangler.swingui.dsm.impl; import java.util.ArrayList; import java.util.List; @@ -11,9 +11,9 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import org.dtangler.swingui.dsm.DsmView; -import org.dtangler.ui.dsm.DsmGuiModel; -import org.dtangler.ui.dsm.DsmGuiModelChangeListener; +import org.hjug.dtangler.swingui.dsm.DsmView; +import org.hjug.dtangler.ui.dsm.DsmGuiModel; +import org.hjug.dtangler.ui.dsm.DsmGuiModelChangeListener; public class DsmPresenter implements ListSelectionListener, DsmGuiModelChangeListener { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/DsmTableModelAdapter.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/DsmTableModelAdapter.java similarity index 82% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/DsmTableModelAdapter.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/DsmTableModelAdapter.java index abd33b7..d3b9ee0 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/DsmTableModelAdapter.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/DsmTableModelAdapter.java @@ -3,14 +3,14 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.dsm.impl; +package org.hjug.dtangler.swingui.dsm.impl; import javax.swing.table.AbstractTableModel; -import org.dtangler.swingui.dsm.SwingDsm; -import org.dtangler.ui.dsm.CellInfo; -import org.dtangler.ui.dsm.DependableInfo; -import org.dtangler.ui.dsm.DsmGuiModel; +import org.hjug.dtangler.swingui.dsm.SwingDsm; +import org.hjug.dtangler.ui.dsm.CellInfo; +import org.hjug.dtangler.ui.dsm.DependableInfo; +import org.hjug.dtangler.ui.dsm.DsmGuiModel; public class DsmTableModelAdapter extends AbstractTableModel { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/DsmViewFactoryImpl.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/DsmViewFactoryImpl.java similarity index 64% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/DsmViewFactoryImpl.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/DsmViewFactoryImpl.java index 516781f..1d5a480 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/DsmViewFactoryImpl.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/DsmViewFactoryImpl.java @@ -3,12 +3,12 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.dsm.impl; +package org.hjug.dtangler.swingui.dsm.impl; -import org.dtangler.swingui.dsm.DsmViewFactory; -import org.dtangler.swingui.dsm.SwingDsm; -import org.dtangler.ui.dsm.DsmGuiModel; -import org.dtangler.ui.dsm.impl.DsmGuiModelImpl; +import org.hjug.dtangler.swingui.dsm.DsmViewFactory; +import org.hjug.dtangler.swingui.dsm.SwingDsm; +import org.hjug.dtangler.ui.dsm.DsmGuiModel; +import org.hjug.dtangler.ui.dsm.impl.DsmGuiModelImpl; public class DsmViewFactoryImpl implements DsmViewFactory { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/SwingDsmView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/SwingDsmView.java similarity index 93% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/SwingDsmView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/SwingDsmView.java index 37e55da..5d98fe5 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/dsm/impl/SwingDsmView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/dsm/impl/SwingDsmView.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.dsm.impl; +package org.hjug.dtangler.swingui.dsm.impl; import javax.swing.JComponent; import javax.swing.JPopupMenu; @@ -11,9 +11,9 @@ import javax.swing.event.ListSelectionListener; import javax.swing.table.TableModel; -import org.dtangler.swingui.dsm.DsmView; -import org.dtangler.ui.dsm.CellInfo; -import org.dtangler.ui.dsm.DependableInfo; +import org.hjug.dtangler.swingui.dsm.DsmView; +import org.hjug.dtangler.ui.dsm.CellInfo; +import org.hjug.dtangler.ui.dsm.DependableInfo; public class SwingDsmView extends JTable implements DsmView { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/FileInputSelection.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/FileInputSelection.java similarity index 94% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/FileInputSelection.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/FileInputSelection.java index f75e2e2..e17ccb4 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/FileInputSelection.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/FileInputSelection.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.fileinput; +package org.hjug.dtangler.swingui.fileinput; import java.util.List; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/FileInputSelector.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/FileInputSelector.java similarity index 91% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/FileInputSelector.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/FileInputSelector.java index e494c3a..c3c9aea 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/FileInputSelector.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/FileInputSelector.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.fileinput; +package org.hjug.dtangler.swingui.fileinput; public interface FileInputSelector { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/DefaultFileInputSelectorModel.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/DefaultFileInputSelectorModel.java similarity index 92% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/DefaultFileInputSelectorModel.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/DefaultFileInputSelectorModel.java index d3484c3..52f77eb 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/DefaultFileInputSelectorModel.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/DefaultFileInputSelectorModel.java @@ -3,16 +3,16 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.fileinput.impl; +package org.hjug.dtangler.swingui.fileinput.impl; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.dtangler.core.dependencyengine.DependencyEngineFactory; -import org.dtangler.swingui.directoryselector.DirectorySelector; -import org.dtangler.swingui.fileinput.FileInputSelection; -import org.dtangler.swingui.textinput.TextInputSelector; +import org.hjug.dtangler.core.dependencyengine.DependencyEngineFactory; +import org.hjug.dtangler.swingui.directoryselector.DirectorySelector; +import org.hjug.dtangler.swingui.fileinput.FileInputSelection; +import org.hjug.dtangler.swingui.textinput.TextInputSelector; public class DefaultFileInputSelectorModel implements FileInputSelectorModel { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorGlue.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorGlue.java similarity index 88% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorGlue.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorGlue.java index 3781801..5c5989a 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorGlue.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorGlue.java @@ -3,15 +3,15 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.fileinput.impl; +package org.hjug.dtangler.swingui.fileinput.impl; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.fileinput.impl.FileInputSelectorView.Actions; -import org.dtangler.swingui.windowmanager.SwingView; -import org.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.fileinput.impl.FileInputSelectorView.Actions; +import org.hjug.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; public class FileInputSelectorGlue { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorImpl.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorImpl.java similarity index 74% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorImpl.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorImpl.java index 05f6719..26b183a 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorImpl.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorImpl.java @@ -3,15 +3,15 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.fileinput.impl; +package org.hjug.dtangler.swingui.fileinput.impl; -import org.dtangler.core.dependencyengine.DependencyEngineFactory; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.directoryselector.DirectorySelector; -import org.dtangler.swingui.fileinput.FileInputSelection; -import org.dtangler.swingui.fileinput.FileInputSelector; -import org.dtangler.swingui.textinput.TextInputSelector; -import org.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.core.dependencyengine.DependencyEngineFactory; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.directoryselector.DirectorySelector; +import org.hjug.dtangler.swingui.fileinput.FileInputSelection; +import org.hjug.dtangler.swingui.fileinput.FileInputSelector; +import org.hjug.dtangler.swingui.textinput.TextInputSelector; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; public class FileInputSelectorImpl implements FileInputSelector { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorModel.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorModel.java similarity index 84% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorModel.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorModel.java index 25a6e2c..7a8ab13 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorModel.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorModel.java @@ -3,11 +3,11 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.fileinput.impl; +package org.hjug.dtangler.swingui.fileinput.impl; import java.util.List; -import org.dtangler.swingui.fileinput.FileInputSelection; +import org.hjug.dtangler.swingui.fileinput.FileInputSelection; public interface FileInputSelectorModel { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorPresenter.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorPresenter.java similarity index 96% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorPresenter.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorPresenter.java index 68f7772..c280424 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorPresenter.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorPresenter.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.fileinput.impl; +package org.hjug.dtangler.swingui.fileinput.impl; public class FileInputSelectorPresenter { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorView.java similarity index 85% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorView.java index faedf80..73031ca 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorView.java @@ -3,11 +3,11 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.fileinput.impl; +package org.hjug.dtangler.swingui.fileinput.impl; import java.util.List; -import org.dtangler.swingui.actionfactory.ActionKey; +import org.hjug.dtangler.swingui.actionfactory.ActionKey; public interface FileInputSelectorView { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/SwingFileInputSelectorView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/SwingFileInputSelectorView.java similarity index 93% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/SwingFileInputSelectorView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/SwingFileInputSelectorView.java index c27b4fe..da1d9b6 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileinput/impl/SwingFileInputSelectorView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileinput/impl/SwingFileInputSelectorView.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.fileinput.impl; +package org.hjug.dtangler.swingui.fileinput.impl; import java.awt.Dimension; import java.awt.event.KeyEvent; @@ -18,10 +18,10 @@ import javax.swing.JList; import javax.swing.JScrollPane; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.actionfactory.KeyActionAdapter; -import org.dtangler.swingui.resource.icons.IconKey; -import org.dtangler.swingui.windowmanager.SwingBaseView; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.actionfactory.KeyActionAdapter; +import org.hjug.dtangler.swingui.resource.icons.IconKey; +import org.hjug.dtangler.swingui.windowmanager.SwingBaseView; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.factories.ButtonBarFactory; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileselector/FileSelector.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileselector/FileSelector.java similarity index 86% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/fileselector/FileSelector.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileselector/FileSelector.java index 2d15884..91c6297 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileselector/FileSelector.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileselector/FileSelector.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.fileselector; +package org.hjug.dtangler.swingui.fileselector; public interface FileSelector { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileselector/impl/SwingFileSelector.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileselector/impl/SwingFileSelector.java similarity index 92% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/fileselector/impl/SwingFileSelector.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileselector/impl/SwingFileSelector.java index 6f7ae4a..a5b84a1 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/fileselector/impl/SwingFileSelector.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/fileselector/impl/SwingFileSelector.java @@ -3,14 +3,14 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.fileselector.impl; +package org.hjug.dtangler.swingui.fileselector.impl; import java.io.File; import javax.swing.JFileChooser; import javax.swing.filechooser.FileFilter; -import org.dtangler.swingui.fileselector.FileSelector; +import org.hjug.dtangler.swingui.fileselector.FileSelector; public class SwingFileSelector implements FileSelector { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/GroupSelector.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/GroupSelector.java similarity index 73% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/GroupSelector.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/GroupSelector.java index 761f7c5..a27fc61 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/GroupSelector.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/GroupSelector.java @@ -3,9 +3,9 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.groupselector; +package org.hjug.dtangler.swingui.groupselector; -import org.dtangler.core.configuration.Group; +import org.hjug.dtangler.core.configuration.Group; public interface GroupSelector { Group createGroup(); diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/GroupGlue.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/GroupGlue.java similarity index 90% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/GroupGlue.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/GroupGlue.java index d61f623..5ff348d 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/GroupGlue.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/GroupGlue.java @@ -3,14 +3,14 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.groupselector.impl; +package org.hjug.dtangler.swingui.groupselector.impl; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.groupselector.impl.GroupView.Actions; -import org.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.groupselector.impl.GroupView.Actions; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; public class GroupGlue { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/GroupModel.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/GroupModel.java similarity index 92% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/GroupModel.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/GroupModel.java index 7962f83..1d41f9d 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/GroupModel.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/GroupModel.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.groupselector.impl; +package org.hjug.dtangler.swingui.groupselector.impl; import java.util.ArrayList; import java.util.Collections; @@ -11,8 +11,8 @@ import java.util.List; import java.util.Set; -import org.dtangler.core.configuration.Group; -import org.dtangler.swingui.textinput.TextInputSelector; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.swingui.textinput.TextInputSelector; public class GroupModel { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/GroupPresenter.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/GroupPresenter.java similarity index 96% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/GroupPresenter.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/GroupPresenter.java index 48ac021..32a5591 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/GroupPresenter.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/GroupPresenter.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.groupselector.impl; +package org.hjug.dtangler.swingui.groupselector.impl; public class GroupPresenter { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/GroupSelectorImpl.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/GroupSelectorImpl.java similarity index 75% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/GroupSelectorImpl.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/GroupSelectorImpl.java index d5acb79..c908c31 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/GroupSelectorImpl.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/GroupSelectorImpl.java @@ -3,13 +3,13 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.groupselector.impl; +package org.hjug.dtangler.swingui.groupselector.impl; -import org.dtangler.core.configuration.Group; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.groupselector.GroupSelector; -import org.dtangler.swingui.textinput.TextInputSelector; -import org.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.groupselector.GroupSelector; +import org.hjug.dtangler.swingui.textinput.TextInputSelector; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; public class GroupSelectorImpl implements GroupSelector { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/GroupView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/GroupView.java similarity index 76% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/GroupView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/GroupView.java index ca8771a..a3bd3c8 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/GroupView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/GroupView.java @@ -3,9 +3,9 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.groupselector.impl; +package org.hjug.dtangler.swingui.groupselector.impl; -import org.dtangler.swingui.actionfactory.ActionKey; +import org.hjug.dtangler.swingui.actionfactory.ActionKey; public interface GroupView { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/SwingGroupView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/SwingGroupView.java similarity index 93% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/SwingGroupView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/SwingGroupView.java index 51d65e9..88d911b 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/groupselector/impl/SwingGroupView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/groupselector/impl/SwingGroupView.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.groupselector.impl; +package org.hjug.dtangler.swingui.groupselector.impl; import java.awt.Dimension; import java.awt.event.KeyEvent; @@ -19,10 +19,10 @@ import javax.swing.JScrollPane; import javax.swing.JTextField; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.actionfactory.KeyActionAdapter; -import org.dtangler.swingui.resource.icons.IconKey; -import org.dtangler.swingui.windowmanager.SwingBaseView; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.actionfactory.KeyActionAdapter; +import org.hjug.dtangler.swingui.resource.icons.IconKey; +import org.hjug.dtangler.swingui.windowmanager.SwingBaseView; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.factories.ButtonBarFactory; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/MainViewFactory.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/MainViewFactory.java similarity index 72% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/MainViewFactory.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/MainViewFactory.java index 9c3287e..866c85d 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/MainViewFactory.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/MainViewFactory.java @@ -3,9 +3,9 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview; +package org.hjug.dtangler.swingui.mainview; -import org.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.Arguments; public interface MainViewFactory { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/ConfigurationModel.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/ConfigurationModel.java similarity index 86% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/ConfigurationModel.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/ConfigurationModel.java index 6f42936..c10669e 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/ConfigurationModel.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/ConfigurationModel.java @@ -3,19 +3,19 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import java.io.File; import java.util.Map; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.ParserConstants; -import org.dtangler.core.input.ArgumentParser; -import org.dtangler.core.input.ConfigFileParser; -import org.dtangler.core.input.ConfigFileWriter; -import org.dtangler.swingui.fileselector.FileSelector; -import org.dtangler.swingui.windowmanager.DialogManager; -import org.dtangler.swingui.windowmanager.DialogManager.DialogResult; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.ParserConstants; +import org.hjug.dtangler.core.input.ArgumentParser; +import org.hjug.dtangler.core.input.ConfigFileParser; +import org.hjug.dtangler.core.input.ConfigFileWriter; +import org.hjug.dtangler.swingui.fileselector.FileSelector; +import org.hjug.dtangler.swingui.windowmanager.DialogManager; +import org.hjug.dtangler.swingui.windowmanager.DialogManager.DialogResult; public class ConfigurationModel { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/DefaultMainViewModel.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/DefaultMainViewModel.java similarity index 91% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/DefaultMainViewModel.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/DefaultMainViewModel.java index c328655..f6dd2aa 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/DefaultMainViewModel.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/DefaultMainViewModel.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import java.io.File; import java.util.ArrayList; @@ -16,27 +16,27 @@ import javax.swing.JOptionPane; -import org.dtangler.core.analysis.configurableanalyzer.ConfigurableDependencyAnalyzer; -import org.dtangler.core.analysisresult.AnalysisResult; -import org.dtangler.core.analysisresult.Violation; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Dependency; -import org.dtangler.core.dependencies.DependencyGraph; -import org.dtangler.core.dependencies.Scope; -import org.dtangler.core.dependencies.Dependencies.DependencyFilter; -import org.dtangler.core.dependencyengine.DependencyEngine; -import org.dtangler.core.dependencyengine.DependencyEngineFactory; -import org.dtangler.core.dsm.Dsm; -import org.dtangler.core.dsmengine.DsmEngine; -import org.dtangler.core.exception.DtException; -import org.dtangler.swingui.fileinput.FileInputSelection; -import org.dtangler.swingui.fileinput.FileInputSelector; -import org.dtangler.swingui.rulesselector.RulesSelector; -import org.dtangler.ui.dsm.DsmGuiModel; -import org.dtangler.ui.dsm.DsmGuiModelChangeListener; -import org.dtangler.ui.dsm.DsmGuiModel.DisplayNameFormat; +import org.hjug.dtangler.core.analysis.configurableanalyzer.ConfigurableDependencyAnalyzer; +import org.hjug.dtangler.core.analysisresult.AnalysisResult; +import org.hjug.dtangler.core.analysisresult.Violation; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.core.dependencies.Scope; +import org.hjug.dtangler.core.dependencies.Dependencies.DependencyFilter; +import org.hjug.dtangler.core.dependencyengine.DependencyEngine; +import org.hjug.dtangler.core.dependencyengine.DependencyEngineFactory; +import org.hjug.dtangler.core.dsm.Dsm; +import org.hjug.dtangler.core.dsmengine.DsmEngine; +import org.hjug.dtangler.core.exception.DtException; +import org.hjug.dtangler.swingui.fileinput.FileInputSelection; +import org.hjug.dtangler.swingui.fileinput.FileInputSelector; +import org.hjug.dtangler.swingui.rulesselector.RulesSelector; +import org.hjug.dtangler.ui.dsm.DsmGuiModel; +import org.hjug.dtangler.ui.dsm.DsmGuiModelChangeListener; +import org.hjug.dtangler.ui.dsm.DsmGuiModel.DisplayNameFormat; public class DefaultMainViewModel implements MainViewModel { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/FileListDropListener.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/FileListDropListener.java similarity index 86% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/FileListDropListener.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/FileListDropListener.java index 22d8d54..346e6b3 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/FileListDropListener.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/FileListDropListener.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import java.io.File; import java.util.List; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/MainView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/MainView.java similarity index 83% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/MainView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/MainView.java index 64efd32..ca59cde 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/MainView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/MainView.java @@ -3,12 +3,12 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import java.util.List; -import org.dtangler.core.dependencies.Scope; -import org.dtangler.swingui.actionfactory.ActionKey; +import org.hjug.dtangler.core.dependencies.Scope; +import org.hjug.dtangler.swingui.actionfactory.ActionKey; public interface MainView { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/MainViewFactoryImpl.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/MainViewFactoryImpl.java similarity index 71% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/MainViewFactoryImpl.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/MainViewFactoryImpl.java index d6bd72e..b6305da 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/MainViewFactoryImpl.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/MainViewFactoryImpl.java @@ -3,20 +3,20 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.dependencyengine.DependencyEngineFactory; -import org.dtangler.swingui.aboutinfodisplayer.AboutInfoDisplayer; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.dsm.DsmViewFactory; -import org.dtangler.swingui.dsm.SwingDsm; -import org.dtangler.swingui.fileinput.FileInputSelector; -import org.dtangler.swingui.fileselector.FileSelector; -import org.dtangler.swingui.mainview.MainViewFactory; -import org.dtangler.swingui.rulesselector.RulesSelector; -import org.dtangler.swingui.windowmanager.DialogManager; -import org.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.dependencyengine.DependencyEngineFactory; +import org.hjug.dtangler.swingui.aboutinfodisplayer.AboutInfoDisplayer; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.dsm.DsmViewFactory; +import org.hjug.dtangler.swingui.dsm.SwingDsm; +import org.hjug.dtangler.swingui.fileinput.FileInputSelector; +import org.hjug.dtangler.swingui.fileselector.FileSelector; +import org.hjug.dtangler.swingui.mainview.MainViewFactory; +import org.hjug.dtangler.swingui.rulesselector.RulesSelector; +import org.hjug.dtangler.swingui.windowmanager.DialogManager; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; public class MainViewFactoryImpl implements MainViewFactory { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/MainViewGlue.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/MainViewGlue.java similarity index 89% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/MainViewGlue.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/MainViewGlue.java index 37ec26d..6fc9710 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/MainViewGlue.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/MainViewGlue.java @@ -3,18 +3,18 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.swingui.aboutinfodisplayer.AboutInfoDisplayer; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.mainview.impl.MainView.Actions; -import org.dtangler.swingui.windowmanager.SwingView; -import org.dtangler.swingui.windowmanager.WindowManager; -import org.dtangler.ui.dsm.DsmGuiModelChangeListener; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.swingui.aboutinfodisplayer.AboutInfoDisplayer; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.mainview.impl.MainView.Actions; +import org.hjug.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.ui.dsm.DsmGuiModelChangeListener; public class MainViewGlue implements DsmGuiModelChangeListener { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/MainViewModel.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/MainViewModel.java similarity index 83% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/MainViewModel.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/MainViewModel.java index 197ae2a..74abb9c 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/MainViewModel.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/MainViewModel.java @@ -3,14 +3,14 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import java.io.File; import java.util.List; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Scope; -import org.dtangler.ui.dsm.DsmGuiModelChangeListener; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Scope; +import org.hjug.dtangler.ui.dsm.DsmGuiModelChangeListener; public interface MainViewModel { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/MainViewPresenter.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/MainViewPresenter.java similarity index 96% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/MainViewPresenter.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/MainViewPresenter.java index 5e0f0f9..fba676f 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/MainViewPresenter.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/MainViewPresenter.java @@ -3,12 +3,12 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import java.io.File; import java.util.List; -import org.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Dependencies; public class MainViewPresenter implements FileListDropListener { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/SwingMainView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/SwingMainView.java similarity index 95% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/SwingMainView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/SwingMainView.java index 3cca48c..bb808f4 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/SwingMainView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/SwingMainView.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import java.awt.Component; import java.awt.Dimension; @@ -35,14 +35,14 @@ import javax.swing.KeyStroke; import javax.swing.plaf.basic.BasicSplitPaneUI; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.Scope; -import org.dtangler.core.dependencies.Dependencies.DependencyFilter; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.actionfactory.ActionKey; -import org.dtangler.swingui.dsm.DsmView; -import org.dtangler.swingui.resource.icons.IconKey; -import org.dtangler.swingui.windowmanager.SwingBaseView; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.Scope; +import org.hjug.dtangler.core.dependencies.Dependencies.DependencyFilter; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.actionfactory.ActionKey; +import org.hjug.dtangler.swingui.dsm.DsmView; +import org.hjug.dtangler.swingui.resource.icons.IconKey; +import org.hjug.dtangler.swingui.windowmanager.SwingBaseView; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.factories.ButtonBarFactory; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/WindowKeyListener.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/WindowKeyListener.java similarity index 96% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/WindowKeyListener.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/WindowKeyListener.java index fc2487c..d5783bc 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/mainview/impl/WindowKeyListener.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/mainview/impl/WindowKeyListener.java @@ -4,7 +4,7 @@ // The full license text can be read from: // http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import java.awt.AWTEvent; import java.awt.Component; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/resource/icons/IconKey.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/resource/icons/IconKey.java similarity index 86% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/resource/icons/IconKey.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/resource/icons/IconKey.java index 9aba4f6..8661bae 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/resource/icons/IconKey.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/resource/icons/IconKey.java @@ -4,7 +4,7 @@ // The full license text can be read from: // http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.resource.icons; +package org.hjug.dtangler.swingui.resource.icons; public enum IconKey { plus12, minus12, input24, police24, refresh24, sysart, dtangler_logo, dtangler16, zoomin16, zoomout16, shorten16 diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/resource/icons/IconProvider.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/resource/icons/IconProvider.java similarity index 80% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/resource/icons/IconProvider.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/resource/icons/IconProvider.java index 27f8737..e6e26e3 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/resource/icons/IconProvider.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/resource/icons/IconProvider.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.resource.icons; +package org.hjug.dtangler.swingui.resource.icons; import java.net.URL; @@ -13,7 +13,7 @@ public class IconProvider { public static ImageIcon getIcon(IconKey iconKey) { URL iconFile = IconProvider.class - .getResource("/org/dtangler/swingui/resource/icons/" + .getResource("/org/hjug/dtangler/swingui/resource/icons/" + iconKey.name() + ".png"); if (iconFile == null) return null; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/RuleMemberSelector.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/RuleMemberSelector.java similarity index 85% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/RuleMemberSelector.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/RuleMemberSelector.java index c40d393..fa43bb9 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/RuleMemberSelector.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/RuleMemberSelector.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulememberselector; +package org.hjug.dtangler.swingui.rulememberselector; import java.util.List; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberGlue.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberGlue.java similarity index 79% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberGlue.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberGlue.java index 9ba0811..b6d0c31 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberGlue.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberGlue.java @@ -3,15 +3,15 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulememberselector.impl; +package org.hjug.dtangler.swingui.rulememberselector.impl; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.rulememberselector.impl.RuleMemberView.Actions; -import org.dtangler.swingui.windowmanager.SwingView; -import org.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.rulememberselector.impl.RuleMemberView.Actions; +import org.hjug.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; public class RuleMemberGlue { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberModel.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberModel.java similarity index 87% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberModel.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberModel.java index 055fbe9..17e67bd 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberModel.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberModel.java @@ -3,11 +3,11 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulememberselector.impl; +package org.hjug.dtangler.swingui.rulememberselector.impl; import java.util.List; -import org.dtangler.core.exception.DtException; +import org.hjug.dtangler.core.exception.DtException; public class RuleMemberModel { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberPresenter.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberPresenter.java similarity index 85% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberPresenter.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberPresenter.java index f6f1021..b372d80 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberPresenter.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberPresenter.java @@ -3,9 +3,9 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulememberselector.impl; +package org.hjug.dtangler.swingui.rulememberselector.impl; -import org.dtangler.swingui.rulememberselector.impl.RuleMemberView.MemberType; +import org.hjug.dtangler.swingui.rulememberselector.impl.RuleMemberView.MemberType; public class RuleMemberPresenter { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberSelectorImpl.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberSelectorImpl.java similarity index 77% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberSelectorImpl.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberSelectorImpl.java index 6c4c1d7..5be2c34 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberSelectorImpl.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberSelectorImpl.java @@ -3,13 +3,13 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulememberselector.impl; +package org.hjug.dtangler.swingui.rulememberselector.impl; import java.util.List; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.rulememberselector.RuleMemberSelector; -import org.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.rulememberselector.RuleMemberSelector; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; public class RuleMemberSelectorImpl implements RuleMemberSelector { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberView.java similarity index 81% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberView.java index ceda000..120076e 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberView.java @@ -3,11 +3,11 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulememberselector.impl; +package org.hjug.dtangler.swingui.rulememberselector.impl; import java.util.List; -import org.dtangler.swingui.actionfactory.ActionKey; +import org.hjug.dtangler.swingui.actionfactory.ActionKey; public interface RuleMemberView { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/SwingRuleMemberView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/SwingRuleMemberView.java similarity index 94% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/SwingRuleMemberView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/SwingRuleMemberView.java index c050e4c..720295a 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulememberselector/impl/SwingRuleMemberView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulememberselector/impl/SwingRuleMemberView.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulememberselector.impl; +package org.hjug.dtangler.swingui.rulememberselector.impl; import java.awt.Component; import java.awt.Dimension; @@ -20,8 +20,8 @@ import javax.swing.JRadioButton; import javax.swing.JTextField; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.windowmanager.SwingBaseView; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.windowmanager.SwingBaseView; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.factories.ButtonBarFactory; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/RulesSelector.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/RulesSelector.java similarity index 72% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/RulesSelector.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/RulesSelector.java index 5b8ccd2..d2b013c 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/RulesSelector.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/RulesSelector.java @@ -3,9 +3,9 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulesselector; +package org.hjug.dtangler.swingui.rulesselector; -import org.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.Arguments; public interface RulesSelector { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/DefaultRulesModel.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/DefaultRulesModel.java similarity index 94% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/DefaultRulesModel.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/DefaultRulesModel.java index 26e748f..945c135 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/DefaultRulesModel.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/DefaultRulesModel.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulesselector.impl; +package org.hjug.dtangler.swingui.rulesselector.impl; import java.util.ArrayList; import java.util.Collections; @@ -14,10 +14,10 @@ import java.util.Set; import java.util.Map.Entry; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.Group; -import org.dtangler.swingui.groupselector.GroupSelector; -import org.dtangler.swingui.rulememberselector.RuleMemberSelector; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.swingui.groupselector.GroupSelector; +import org.hjug.dtangler.swingui.rulememberselector.RuleMemberSelector; public class DefaultRulesModel implements RulesModel { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/RulesGlue.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesGlue.java similarity index 93% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/RulesGlue.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesGlue.java index af783b3..0741189 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/RulesGlue.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesGlue.java @@ -3,15 +3,15 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulesselector.impl; +package org.hjug.dtangler.swingui.rulesselector.impl; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.rulesselector.impl.RulesView.Actions; -import org.dtangler.swingui.windowmanager.SwingView; -import org.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.rulesselector.impl.RulesView.Actions; +import org.hjug.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; public class RulesGlue { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/RulesModel.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesModel.java similarity index 93% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/RulesModel.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesModel.java index 62c03a5..5e009cf 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/RulesModel.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesModel.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulesselector.impl; +package org.hjug.dtangler.swingui.rulesselector.impl; import java.util.List; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/RulesPresenter.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesPresenter.java similarity index 93% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/RulesPresenter.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesPresenter.java index 6d87b44..3fd758d 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/RulesPresenter.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesPresenter.java @@ -3,10 +3,10 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulesselector.impl; +package org.hjug.dtangler.swingui.rulesselector.impl; -import org.dtangler.swingui.rulesselector.impl.RulesModel.RuleModel; -import org.dtangler.swingui.rulesselector.impl.RulesView.RuleView; +import org.hjug.dtangler.swingui.rulesselector.impl.RulesModel.RuleModel; +import org.hjug.dtangler.swingui.rulesselector.impl.RulesView.RuleView; public class RulesPresenter { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/RulesSelectorImpl.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesSelectorImpl.java similarity index 72% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/RulesSelectorImpl.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesSelectorImpl.java index df7d18f..6f1e9df 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/RulesSelectorImpl.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesSelectorImpl.java @@ -3,14 +3,14 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulesselector.impl; +package org.hjug.dtangler.swingui.rulesselector.impl; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.groupselector.GroupSelector; -import org.dtangler.swingui.rulememberselector.RuleMemberSelector; -import org.dtangler.swingui.rulesselector.RulesSelector; -import org.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.groupselector.GroupSelector; +import org.hjug.dtangler.swingui.rulememberselector.RuleMemberSelector; +import org.hjug.dtangler.swingui.rulesselector.RulesSelector; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; public class RulesSelectorImpl implements RulesSelector { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/RulesView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesView.java similarity index 88% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/RulesView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesView.java index 3b15112..60d8bbd 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/RulesView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesView.java @@ -3,11 +3,11 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulesselector.impl; +package org.hjug.dtangler.swingui.rulesselector.impl; import java.util.List; -import org.dtangler.swingui.actionfactory.ActionKey; +import org.hjug.dtangler.swingui.actionfactory.ActionKey; public interface RulesView { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/SwingRuleView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/SwingRuleView.java similarity index 88% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/SwingRuleView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/SwingRuleView.java index 8d9e65c..8983d7f 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/SwingRuleView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/SwingRuleView.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulesselector.impl; +package org.hjug.dtangler.swingui.rulesselector.impl; import java.awt.Dimension; import java.awt.event.KeyEvent; @@ -19,13 +19,13 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.actionfactory.ActionKey; -import org.dtangler.swingui.actionfactory.KeyActionAdapter; -import org.dtangler.swingui.resource.icons.IconKey; -import org.dtangler.swingui.rulesselector.impl.RulesView.Actions; -import org.dtangler.swingui.rulesselector.impl.RulesView.RuleView; -import org.dtangler.swingui.windowmanager.SwingBaseView; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.actionfactory.ActionKey; +import org.hjug.dtangler.swingui.actionfactory.KeyActionAdapter; +import org.hjug.dtangler.swingui.resource.icons.IconKey; +import org.hjug.dtangler.swingui.rulesselector.impl.RulesView.Actions; +import org.hjug.dtangler.swingui.rulesselector.impl.RulesView.RuleView; +import org.hjug.dtangler.swingui.windowmanager.SwingBaseView; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.layout.FormLayout; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/SwingRulesView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/SwingRulesView.java similarity index 93% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/SwingRulesView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/SwingRulesView.java index 28f9d7b..07d52ad 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/rulesselector/impl/SwingRulesView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/rulesselector/impl/SwingRulesView.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulesselector.impl; +package org.hjug.dtangler.swingui.rulesselector.impl; import java.awt.Component; import java.awt.Dimension; @@ -20,10 +20,10 @@ import javax.swing.JScrollPane; import javax.swing.JTabbedPane; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.actionfactory.KeyActionAdapter; -import org.dtangler.swingui.resource.icons.IconKey; -import org.dtangler.swingui.windowmanager.SwingBaseView; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.actionfactory.KeyActionAdapter; +import org.hjug.dtangler.swingui.resource.icons.IconKey; +import org.hjug.dtangler.swingui.windowmanager.SwingBaseView; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.factories.ButtonBarFactory; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/TextInputSelector.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/TextInputSelector.java similarity index 86% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/TextInputSelector.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/TextInputSelector.java index c046ad3..56ee585 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/TextInputSelector.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/TextInputSelector.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.textinput; +package org.hjug.dtangler.swingui.textinput; public interface TextInputSelector { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/SwingTextInputView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/SwingTextInputView.java similarity index 92% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/SwingTextInputView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/SwingTextInputView.java index 46eb767..6da4aa8 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/SwingTextInputView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/SwingTextInputView.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.textinput.impl; +package org.hjug.dtangler.swingui.textinput.impl; import java.awt.Dimension; import java.awt.event.KeyEvent; @@ -13,8 +13,8 @@ import javax.swing.JLabel; import javax.swing.JTextField; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.windowmanager.SwingBaseView; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.windowmanager.SwingBaseView; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.factories.ButtonBarFactory; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/TextInputGlue.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/TextInputGlue.java similarity index 77% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/TextInputGlue.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/TextInputGlue.java index 53ccefd..ad03c7b 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/TextInputGlue.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/TextInputGlue.java @@ -3,15 +3,15 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.textinput.impl; +package org.hjug.dtangler.swingui.textinput.impl; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.textinput.impl.TextInputView.Actions; -import org.dtangler.swingui.windowmanager.SwingView; -import org.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.textinput.impl.TextInputView.Actions; +import org.hjug.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; public class TextInputGlue { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/TextInputModel.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/TextInputModel.java similarity index 92% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/TextInputModel.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/TextInputModel.java index 3d4722b..30c57c5 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/TextInputModel.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/TextInputModel.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.textinput.impl; +package org.hjug.dtangler.swingui.textinput.impl; class TextInputModel { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/TextInputPresenter.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/TextInputPresenter.java similarity index 92% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/TextInputPresenter.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/TextInputPresenter.java index 8036da2..c9efcf0 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/TextInputPresenter.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/TextInputPresenter.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.textinput.impl; +package org.hjug.dtangler.swingui.textinput.impl; class TextInputPresenter { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/TextInputSelectorImpl.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/TextInputSelectorImpl.java similarity index 78% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/TextInputSelectorImpl.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/TextInputSelectorImpl.java index 54a84c6..bd23f88 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/TextInputSelectorImpl.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/TextInputSelectorImpl.java @@ -3,11 +3,11 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.textinput.impl; +package org.hjug.dtangler.swingui.textinput.impl; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.textinput.TextInputSelector; -import org.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.textinput.TextInputSelector; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; public class TextInputSelectorImpl implements TextInputSelector { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/TextInputView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/TextInputView.java similarity index 77% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/TextInputView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/TextInputView.java index debbef2..79c8d67 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/textinput/impl/TextInputView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/textinput/impl/TextInputView.java @@ -3,9 +3,9 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.textinput.impl; +package org.hjug.dtangler.swingui.textinput.impl; -import org.dtangler.swingui.actionfactory.ActionKey; +import org.hjug.dtangler.swingui.actionfactory.ActionKey; interface TextInputView { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/DialogManager.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/DialogManager.java similarity index 87% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/DialogManager.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/DialogManager.java index f435d67..5202d62 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/DialogManager.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/DialogManager.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager; +package org.hjug.dtangler.swingui.windowmanager; public interface DialogManager { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/SwingBaseView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/SwingBaseView.java similarity index 91% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/SwingBaseView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/SwingBaseView.java index 38ae2a4..cfb7494 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/SwingBaseView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/SwingBaseView.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager; +package org.hjug.dtangler.swingui.windowmanager; import java.awt.Component; import java.awt.Cursor; @@ -28,13 +28,13 @@ import javax.swing.SwingConstants; import javax.swing.event.ListSelectionListener; -import org.dtangler.swingui.actionfactory.ActionExecutionListener; -import org.dtangler.swingui.actionfactory.ActionFactory; -import org.dtangler.swingui.actionfactory.ActionKey; -import org.dtangler.swingui.actionfactory.DocumentChangeActionAdapter; -import org.dtangler.swingui.actionfactory.ListSelectionActionAdapter; -import org.dtangler.swingui.resource.icons.IconKey; -import org.dtangler.swingui.resource.icons.IconProvider; +import org.hjug.dtangler.swingui.actionfactory.ActionExecutionListener; +import org.hjug.dtangler.swingui.actionfactory.ActionFactory; +import org.hjug.dtangler.swingui.actionfactory.ActionKey; +import org.hjug.dtangler.swingui.actionfactory.DocumentChangeActionAdapter; +import org.hjug.dtangler.swingui.actionfactory.ListSelectionActionAdapter; +import org.hjug.dtangler.swingui.resource.icons.IconKey; +import org.hjug.dtangler.swingui.resource.icons.IconProvider; import com.jgoodies.forms.builder.ButtonStackBuilder; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/SwingView.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/SwingView.java similarity index 92% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/SwingView.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/SwingView.java index fcbb34a..568baa3 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/SwingView.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/SwingView.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager; +package org.hjug.dtangler.swingui.windowmanager; import java.awt.Component; import java.awt.Dimension; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/UIExceptionHandler.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/UIExceptionHandler.java similarity index 84% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/UIExceptionHandler.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/UIExceptionHandler.java index db4b945..bb8edce 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/UIExceptionHandler.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/UIExceptionHandler.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager; +package org.hjug.dtangler.swingui.windowmanager; public interface UIExceptionHandler { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/UIExceptionHandlerDelegator.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/UIExceptionHandlerDelegator.java similarity index 91% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/UIExceptionHandlerDelegator.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/UIExceptionHandlerDelegator.java index 8c3e4ec..48aa869 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/UIExceptionHandlerDelegator.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/UIExceptionHandlerDelegator.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager; +package org.hjug.dtangler.swingui.windowmanager; public class UIExceptionHandlerDelegator { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/WindowInteractionProvider.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/WindowInteractionProvider.java similarity index 84% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/WindowInteractionProvider.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/WindowInteractionProvider.java index 9ce5a4e..d1e4a37 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/WindowInteractionProvider.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/WindowInteractionProvider.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager; +package org.hjug.dtangler.swingui.windowmanager; public interface WindowInteractionProvider { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/WindowManager.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/WindowManager.java similarity index 86% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/WindowManager.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/WindowManager.java index b372eeb..d1e1af9 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/WindowManager.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/WindowManager.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager; +package org.hjug.dtangler.swingui.windowmanager; public interface WindowManager { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/impl/ErrorDisplayComponent.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/impl/ErrorDisplayComponent.java similarity index 97% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/impl/ErrorDisplayComponent.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/impl/ErrorDisplayComponent.java index 5fb753d..19209ba 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/impl/ErrorDisplayComponent.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/impl/ErrorDisplayComponent.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager.impl; +package org.hjug.dtangler.swingui.windowmanager.impl; import javax.swing.JComponent; import javax.swing.JScrollPane; diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/impl/SwingWindowManager.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/impl/SwingWindowManager.java similarity index 90% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/impl/SwingWindowManager.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/impl/SwingWindowManager.java index 8febbe7..f3ea468 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/impl/SwingWindowManager.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/impl/SwingWindowManager.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager.impl; +package org.hjug.dtangler.swingui.windowmanager.impl; import java.awt.Dimension; import java.awt.Point; @@ -18,13 +18,13 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; -import org.dtangler.core.exception.DtException; -import org.dtangler.swingui.resource.icons.IconKey; -import org.dtangler.swingui.resource.icons.IconProvider; -import org.dtangler.swingui.windowmanager.DialogManager; -import org.dtangler.swingui.windowmanager.SwingView; -import org.dtangler.swingui.windowmanager.UIExceptionHandler; -import org.dtangler.swingui.windowmanager.WindowManager; +import org.hjug.dtangler.core.exception.DtException; +import org.hjug.dtangler.swingui.resource.icons.IconKey; +import org.hjug.dtangler.swingui.resource.icons.IconProvider; +import org.hjug.dtangler.swingui.windowmanager.DialogManager; +import org.hjug.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.windowmanager.UIExceptionHandler; +import org.hjug.dtangler.swingui.windowmanager.WindowManager; public class SwingWindowManager implements WindowManager, DialogManager, UIExceptionHandler { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/impl/WindowInteractionProviderJDialogImpl.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/impl/WindowInteractionProviderJDialogImpl.java similarity index 79% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/impl/WindowInteractionProviderJDialogImpl.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/impl/WindowInteractionProviderJDialogImpl.java index baa507b..8cebc76 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/impl/WindowInteractionProviderJDialogImpl.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/impl/WindowInteractionProviderJDialogImpl.java @@ -3,11 +3,11 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager.impl; +package org.hjug.dtangler.swingui.windowmanager.impl; import javax.swing.JDialog; -import org.dtangler.swingui.windowmanager.WindowInteractionProvider; +import org.hjug.dtangler.swingui.windowmanager.WindowInteractionProvider; public class WindowInteractionProviderJDialogImpl implements WindowInteractionProvider { diff --git a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/impl/WindowInteractionProviderJFrameImpl.java b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/impl/WindowInteractionProviderJFrameImpl.java similarity index 79% rename from dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/impl/WindowInteractionProviderJFrameImpl.java rename to dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/impl/WindowInteractionProviderJFrameImpl.java index 65e9989..7dd8a55 100644 --- a/dtangler-swingui/src/main/java/org/dtangler/swingui/windowmanager/impl/WindowInteractionProviderJFrameImpl.java +++ b/dtangler-swingui/src/main/java/org/hjug/dtangler/swingui/windowmanager/impl/WindowInteractionProviderJFrameImpl.java @@ -3,11 +3,11 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager.impl; +package org.hjug.dtangler.swingui.windowmanager.impl; import javax.swing.JFrame; -import org.dtangler.swingui.windowmanager.WindowInteractionProvider; +import org.hjug.dtangler.swingui.windowmanager.WindowInteractionProvider; public class WindowInteractionProviderJFrameImpl implements WindowInteractionProvider { diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/dtangler16.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/dtangler16.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/dtangler16.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/dtangler16.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/dtangler_logo.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/dtangler_logo.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/dtangler_logo.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/dtangler_logo.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/input12.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/input12.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/input12.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/input12.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/input16.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/input16.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/input16.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/input16.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/input24.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/input24.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/input24.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/input24.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/input32.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/input32.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/input32.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/input32.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/minus12.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/minus12.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/minus12.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/minus12.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/minus16.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/minus16.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/minus16.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/minus16.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/minus24.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/minus24.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/minus24.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/minus24.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/minus32.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/minus32.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/minus32.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/minus32.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/plus12.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/plus12.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/plus12.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/plus12.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/plus16.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/plus16.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/plus16.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/plus16.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/plus24.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/plus24.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/plus24.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/plus24.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/plus32.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/plus32.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/plus32.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/plus32.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/police12.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/police12.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/police12.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/police12.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/police16.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/police16.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/police16.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/police16.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/police24.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/police24.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/police24.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/police24.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/police32.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/police32.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/police32.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/police32.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/refresh12.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/refresh12.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/refresh12.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/refresh12.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/refresh16.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/refresh16.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/refresh16.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/refresh16.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/refresh24.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/refresh24.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/refresh24.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/refresh24.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/refresh32.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/refresh32.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/refresh32.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/refresh32.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/shorten16.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/shorten16.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/shorten16.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/shorten16.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/sysart.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/sysart.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/sysart.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/sysart.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/teejotain16.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/teejotain16.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/teejotain16.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/teejotain16.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/teejotain24.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/teejotain24.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/teejotain24.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/teejotain24.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/teejotain32.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/teejotain32.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/teejotain32.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/teejotain32.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/zoomin16.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/zoomin16.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/zoomin16.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/zoomin16.png diff --git a/dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/zoomout16.png b/dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/zoomout16.png similarity index 100% rename from dtangler-swingui/src/main/resources/org/dtangler/swingui/resource/icons/zoomout16.png rename to dtangler-swingui/src/main/resources/org/hjug/dtangler/swingui/resource/icons/zoomout16.png diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoFeatureTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoFeatureTest.java similarity index 90% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoFeatureTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoFeatureTest.java index 6425b73..44c6ecc 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoFeatureTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoFeatureTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.aboutinfodisplayer.impl; +package org.hjug.dtangler.swingui.aboutinfodisplayer.impl; import static org.junit.Assert.assertNull; @@ -11,7 +11,7 @@ import javax.swing.KeyStroke; -import org.dtangler.swingui.windowmanager.MockWindowManager; +import org.hjug.dtangler.swingui.windowmanager.MockWindowManager; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoViewDriver.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoViewDriver.java similarity index 87% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoViewDriver.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoViewDriver.java index 715b540..4223384 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoViewDriver.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/aboutinfodisplayer/impl/AboutInfoViewDriver.java @@ -3,13 +3,13 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.aboutinfodisplayer.impl; +package org.hjug.dtangler.swingui.aboutinfodisplayer.impl; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.KeyStroke; -import org.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.windowmanager.SwingView; import org.uispec4j.Button; import org.uispec4j.Panel; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/actionfactory/ActionFactoryTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/actionfactory/ActionFactoryTest.java similarity index 98% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/actionfactory/ActionFactoryTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/actionfactory/ActionFactoryTest.java index afd3480..1b37a46 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/actionfactory/ActionFactoryTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/actionfactory/ActionFactoryTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.actionfactory; +package org.hjug.dtangler.swingui.actionfactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/actionfactory/KeyActionAdapterTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/actionfactory/KeyActionAdapterTest.java similarity index 96% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/actionfactory/KeyActionAdapterTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/actionfactory/KeyActionAdapterTest.java index 8e6e65f..cdffe3e 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/actionfactory/KeyActionAdapterTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/actionfactory/KeyActionAdapterTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.actionfactory; +package org.hjug.dtangler.swingui.actionfactory; import static org.junit.Assert.assertEquals; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/actionfactory/MockActionListener.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/actionfactory/MockActionListener.java similarity index 89% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/actionfactory/MockActionListener.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/actionfactory/MockActionListener.java index 8a778da..07850fe 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/actionfactory/MockActionListener.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/actionfactory/MockActionListener.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.actionfactory; +package org.hjug.dtangler.swingui.actionfactory; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/app/ApplicationStarterSmokeTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/app/ApplicationStarterSmokeTest.java similarity index 73% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/app/ApplicationStarterSmokeTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/app/ApplicationStarterSmokeTest.java index 169eb01..bff7722 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/app/ApplicationStarterSmokeTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/app/ApplicationStarterSmokeTest.java @@ -3,13 +3,13 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.app; +package org.hjug.dtangler.swingui.app; import static org.junit.Assert.assertNotNull; -import org.dtangler.swingui.ApplicationStarter; -import org.dtangler.swingui.windowmanager.MockDialogManager; -import org.dtangler.swingui.windowmanager.MockWindowManager; +import org.hjug.dtangler.swingui.ApplicationStarter; +import org.hjug.dtangler.swingui.windowmanager.MockDialogManager; +import org.hjug.dtangler.swingui.windowmanager.MockWindowManager; import org.junit.Test; public class ApplicationStarterSmokeTest { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/directoryselector/impl/FileNameExtensionFilterTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/directoryselector/impl/FileNameExtensionFilterTest.java similarity index 95% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/directoryselector/impl/FileNameExtensionFilterTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/directoryselector/impl/FileNameExtensionFilterTest.java index 8337100..85d9c94 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/directoryselector/impl/FileNameExtensionFilterTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/directoryselector/impl/FileNameExtensionFilterTest.java @@ -1,4 +1,4 @@ -package org.dtangler.swingui.directoryselector.impl; +package org.hjug.dtangler.swingui.directoryselector.impl; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/directoryselector/impl/SwingDirectorySelectorTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/directoryselector/impl/SwingDirectorySelectorTest.java similarity index 96% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/directoryselector/impl/SwingDirectorySelectorTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/directoryselector/impl/SwingDirectorySelectorTest.java index 9e3bdf5..cec4b74 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/directoryselector/impl/SwingDirectorySelectorTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/directoryselector/impl/SwingDirectorySelectorTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.directoryselector.impl; +package org.hjug.dtangler.swingui.directoryselector.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/directoryselector/impl/TestableSwingDirectorySelector.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/directoryselector/impl/TestableSwingDirectorySelector.java similarity index 92% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/directoryselector/impl/TestableSwingDirectorySelector.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/directoryselector/impl/TestableSwingDirectorySelector.java index edd522f..716ea35 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/directoryselector/impl/TestableSwingDirectorySelector.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/directoryselector/impl/TestableSwingDirectorySelector.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.directoryselector.impl; +package org.hjug.dtangler.swingui.directoryselector.impl; import javax.swing.JFileChooser; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/dsm/impl/CellInfoTableCellRendererTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/dsm/impl/CellInfoTableCellRendererTest.java similarity index 93% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/dsm/impl/CellInfoTableCellRendererTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/dsm/impl/CellInfoTableCellRendererTest.java index 1b02e32..e6dcfe7 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/dsm/impl/CellInfoTableCellRendererTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/dsm/impl/CellInfoTableCellRendererTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.dsm.impl; +package org.hjug.dtangler.swingui.dsm.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -13,8 +13,8 @@ import javax.swing.JLabel; -import org.dtangler.ui.dsm.MockCellInfo; -import org.dtangler.ui.dsm.NullCellInfo; +import org.hjug.dtangler.ui.dsm.MockCellInfo; +import org.hjug.dtangler.ui.dsm.NullCellInfo; import org.junit.Test; public class CellInfoTableCellRendererTest { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/dsm/impl/DependableInfoRowTableCellRendererTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/dsm/impl/DependableInfoRowTableCellRendererTest.java similarity index 91% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/dsm/impl/DependableInfoRowTableCellRendererTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/dsm/impl/DependableInfoRowTableCellRendererTest.java index 3f9ae1f..e53aa29 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/dsm/impl/DependableInfoRowTableCellRendererTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/dsm/impl/DependableInfoRowTableCellRendererTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.dsm.impl; +package org.hjug.dtangler.swingui.dsm.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -12,7 +12,7 @@ import javax.swing.JLabel; -import org.dtangler.ui.dsm.MockDependableInfo; +import org.hjug.dtangler.ui.dsm.MockDependableInfo; import org.junit.Test; public class DependableInfoRowTableCellRendererTest { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/dsm/impl/DsmViewDriver.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/dsm/impl/DsmViewDriver.java similarity index 96% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/dsm/impl/DsmViewDriver.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/dsm/impl/DsmViewDriver.java index 8c6fdbc..51cd2b7 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/dsm/impl/DsmViewDriver.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/dsm/impl/DsmViewDriver.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.dsm.impl; +package org.hjug.dtangler.swingui.dsm.impl; import javax.swing.JComponent; import javax.swing.JTable; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/dsm/impl/SwingDsmFeatureTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/dsm/impl/SwingDsmFeatureTest.java similarity index 85% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/dsm/impl/SwingDsmFeatureTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/dsm/impl/SwingDsmFeatureTest.java index 9d10b30..1d295cc 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/dsm/impl/SwingDsmFeatureTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/dsm/impl/SwingDsmFeatureTest.java @@ -3,16 +3,16 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.dsm.impl; +package org.hjug.dtangler.swingui.dsm.impl; import static org.junit.Assert.assertEquals; import java.util.Collections; -import org.dtangler.core.analysisresult.AnalysisResult; -import org.dtangler.core.dsmengine.DsmEngine; -import org.dtangler.core.testutil.dependenciesbuilder.DependencyGraphBuilder; -import org.dtangler.swingui.dsm.SwingDsm; +import org.hjug.dtangler.core.analysisresult.AnalysisResult; +import org.hjug.dtangler.core.dsmengine.DsmEngine; +import org.hjug.dtangler.core.testutil.dependenciesbuilder.DependencyGraphBuilder; +import org.hjug.dtangler.swingui.dsm.SwingDsm; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/fileinput/impl/DefaultFileInputSelectorModelTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/fileinput/impl/DefaultFileInputSelectorModelTest.java similarity index 88% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/fileinput/impl/DefaultFileInputSelectorModelTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/fileinput/impl/DefaultFileInputSelectorModelTest.java index 4947f7b..0fb30e7 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/fileinput/impl/DefaultFileInputSelectorModelTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/fileinput/impl/DefaultFileInputSelectorModelTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.fileinput.impl; +package org.hjug.dtangler.swingui.fileinput.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -13,11 +13,11 @@ import java.util.Arrays; -import org.dtangler.core.dependencyengine.DependencyEngine; -import org.dtangler.core.dependencyengine.DependencyEngineFactory; -import org.dtangler.core.dependencyengine.MockDependencyEngine; -import org.dtangler.swingui.fileinput.FileInputSelection; -import org.dtangler.swingui.textinput.MockTextInputSelector; +import org.hjug.dtangler.core.dependencyengine.DependencyEngine; +import org.hjug.dtangler.core.dependencyengine.DependencyEngineFactory; +import org.hjug.dtangler.core.dependencyengine.MockDependencyEngine; +import org.hjug.dtangler.swingui.fileinput.FileInputSelection; +import org.hjug.dtangler.swingui.textinput.MockTextInputSelector; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorFeatureTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorFeatureTest.java similarity index 92% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorFeatureTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorFeatureTest.java index b335bdd..f441c69 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/fileinput/impl/FileInputSelectorFeatureTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputSelectorFeatureTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.fileinput.impl; +package org.hjug.dtangler.swingui.fileinput.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -12,13 +12,13 @@ import java.util.Arrays; -import org.dtangler.core.dependencyengine.DependencyEngine; -import org.dtangler.core.dependencyengine.DependencyEngineFactory; -import org.dtangler.core.dependencyengine.MockDependencyEngine; -import org.dtangler.swingui.fileinput.FileInputSelection; -import org.dtangler.swingui.fileinput.FileInputSelector; -import org.dtangler.swingui.textinput.MockTextInputSelector; -import org.dtangler.swingui.windowmanager.MockWindowManager; +import org.hjug.dtangler.core.dependencyengine.DependencyEngine; +import org.hjug.dtangler.core.dependencyengine.DependencyEngineFactory; +import org.hjug.dtangler.core.dependencyengine.MockDependencyEngine; +import org.hjug.dtangler.swingui.fileinput.FileInputSelection; +import org.hjug.dtangler.swingui.fileinput.FileInputSelector; +import org.hjug.dtangler.swingui.textinput.MockTextInputSelector; +import org.hjug.dtangler.swingui.windowmanager.MockWindowManager; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/fileinput/impl/FileInputViewDriver.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputViewDriver.java similarity index 91% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/fileinput/impl/FileInputViewDriver.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputViewDriver.java index d54d724..f73def6 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/fileinput/impl/FileInputViewDriver.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/fileinput/impl/FileInputViewDriver.java @@ -3,9 +3,9 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.fileinput.impl; +package org.hjug.dtangler.swingui.fileinput.impl; -import org.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.windowmanager.SwingView; import org.uispec4j.Button; import org.uispec4j.ComboBox; import org.uispec4j.ListBox; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/fileinput/impl/MockDirectorySelector.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/fileinput/impl/MockDirectorySelector.java similarity index 83% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/fileinput/impl/MockDirectorySelector.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/fileinput/impl/MockDirectorySelector.java index 8b6f512..4251374 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/fileinput/impl/MockDirectorySelector.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/fileinput/impl/MockDirectorySelector.java @@ -3,11 +3,11 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.fileinput.impl; +package org.hjug.dtangler.swingui.fileinput.impl; import java.util.List; -import org.dtangler.swingui.directoryselector.DirectorySelector; +import org.hjug.dtangler.swingui.directoryselector.DirectorySelector; public class MockDirectorySelector implements DirectorySelector { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/groupselector/MockGroupSelector.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/groupselector/MockGroupSelector.java similarity index 85% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/groupselector/MockGroupSelector.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/groupselector/MockGroupSelector.java index 213c6de..aa5c1aa 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/groupselector/MockGroupSelector.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/groupselector/MockGroupSelector.java @@ -3,9 +3,9 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.groupselector; +package org.hjug.dtangler.swingui.groupselector; -import org.dtangler.core.configuration.Group; +import org.hjug.dtangler.core.configuration.Group; public class MockGroupSelector implements GroupSelector { private Group nextResult; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/groupselector/impl/GroupSelectorDriver.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/groupselector/impl/GroupSelectorDriver.java similarity index 91% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/groupselector/impl/GroupSelectorDriver.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/groupselector/impl/GroupSelectorDriver.java index b26a337..0758b39 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/groupselector/impl/GroupSelectorDriver.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/groupselector/impl/GroupSelectorDriver.java @@ -3,9 +3,9 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.groupselector.impl; +package org.hjug.dtangler.swingui.groupselector.impl; -import org.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.windowmanager.SwingView; import org.uispec4j.Button; import org.uispec4j.ListBox; import org.uispec4j.Panel; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/groupselector/impl/GroupSelectorFeatureTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/groupselector/impl/GroupSelectorFeatureTest.java similarity index 96% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/groupselector/impl/GroupSelectorFeatureTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/groupselector/impl/GroupSelectorFeatureTest.java index 9f8f62f..0904064 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/groupselector/impl/GroupSelectorFeatureTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/groupselector/impl/GroupSelectorFeatureTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.groupselector.impl; +package org.hjug.dtangler.swingui.groupselector.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -15,9 +15,9 @@ import java.util.Collections; import java.util.HashSet; -import org.dtangler.core.configuration.Group; -import org.dtangler.swingui.textinput.MockTextInputSelector; -import org.dtangler.swingui.windowmanager.MockWindowManager; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.swingui.textinput.MockTextInputSelector; +import org.hjug.dtangler.swingui.windowmanager.MockWindowManager; import org.junit.Before; import org.junit.Test; import org.uispec4j.Button; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/BasicFeaturesTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/BasicFeaturesTest.java similarity index 86% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/BasicFeaturesTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/BasicFeaturesTest.java index a02be73..d68073f 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/BasicFeaturesTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/BasicFeaturesTest.java @@ -4,7 +4,7 @@ // The full license text can be read from: // http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -14,17 +14,17 @@ import java.util.Collections; import java.util.List; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.TestDependable; -import org.dtangler.core.dependencies.TestScope; -import org.dtangler.core.dependencyengine.DependencyEngineFactory; -import org.dtangler.core.dependencyengine.MockDependencyEngine; -import org.dtangler.swingui.dsm.impl.DsmViewFactoryImpl; -import org.dtangler.swingui.testutil.SnapShotTaker; -import org.dtangler.swingui.windowmanager.MockDialogManager; -import org.dtangler.swingui.windowmanager.MockWindowManager; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.dependencies.TestScope; +import org.hjug.dtangler.core.dependencyengine.DependencyEngineFactory; +import org.hjug.dtangler.core.dependencyengine.MockDependencyEngine; +import org.hjug.dtangler.swingui.dsm.impl.DsmViewFactoryImpl; +import org.hjug.dtangler.swingui.testutil.SnapShotTaker; +import org.hjug.dtangler.swingui.windowmanager.MockDialogManager; +import org.hjug.dtangler.swingui.windowmanager.MockWindowManager; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/ConfigurationModelTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/ConfigurationModelTest.java similarity index 95% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/ConfigurationModelTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/ConfigurationModelTest.java index dbb9a26..ffcff35 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/ConfigurationModelTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/ConfigurationModelTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -11,9 +11,9 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.swingui.windowmanager.MockDialogManager; -import org.dtangler.swingui.windowmanager.DialogManager.DialogResult; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.swingui.windowmanager.MockDialogManager; +import org.hjug.dtangler.swingui.windowmanager.DialogManager.DialogResult; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/DsmInteractionTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/DsmInteractionTest.java similarity index 91% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/DsmInteractionTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/DsmInteractionTest.java index c4278b2..83379cb 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/DsmInteractionTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/DsmInteractionTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -12,17 +12,17 @@ import java.util.Arrays; import java.util.Collections; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.TestDependable; -import org.dtangler.core.dependencies.TestScope; -import org.dtangler.core.dependencyengine.DependencyEngineFactory; -import org.dtangler.core.dependencyengine.MockDependencyEngine; -import org.dtangler.swingui.dsm.DsmViewFactory; -import org.dtangler.swingui.dsm.impl.DsmViewFactoryImpl; -import org.dtangler.swingui.windowmanager.MockDialogManager; -import org.dtangler.swingui.windowmanager.MockWindowManager; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.dependencies.TestScope; +import org.hjug.dtangler.core.dependencyengine.DependencyEngineFactory; +import org.hjug.dtangler.core.dependencyengine.MockDependencyEngine; +import org.hjug.dtangler.swingui.dsm.DsmViewFactory; +import org.hjug.dtangler.swingui.dsm.impl.DsmViewFactoryImpl; +import org.hjug.dtangler.swingui.windowmanager.MockDialogManager; +import org.hjug.dtangler.swingui.windowmanager.MockWindowManager; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MainViewDriver.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MainViewDriver.java similarity index 93% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MainViewDriver.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MainViewDriver.java index 0f4b48f..db57916 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MainViewDriver.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MainViewDriver.java @@ -4,7 +4,7 @@ // The full license text can be read from: // http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import java.awt.Point; import java.awt.datatransfer.DataFlavor; @@ -14,8 +14,8 @@ import java.awt.dnd.DropTargetDropEvent; import java.io.IOException; -import org.dtangler.swingui.dsm.impl.DsmViewDriver; -import org.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.dsm.impl.DsmViewDriver; +import org.hjug.dtangler.swingui.windowmanager.SwingView; import org.uispec4j.Button; import org.uispec4j.ComboBox; import org.uispec4j.ListBox; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/ManagingConfigurationsTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/ManagingConfigurationsTest.java similarity index 95% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/ManagingConfigurationsTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/ManagingConfigurationsTest.java index 1e0348a..31ec00b 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/ManagingConfigurationsTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/ManagingConfigurationsTest.java @@ -4,7 +4,7 @@ // The full license text can be read from: // http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -21,15 +21,15 @@ import java.util.List; import java.util.Set; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.dependencyengine.DependencyEngineFactory; -import org.dtangler.core.dependencyengine.MockDependencyEngine; -import org.dtangler.swingui.dsm.DsmViewFactory; -import org.dtangler.swingui.dsm.impl.DsmViewFactoryImpl; -import org.dtangler.swingui.fileinput.FileInputSelection; -import org.dtangler.swingui.windowmanager.MockDialogManager; -import org.dtangler.swingui.windowmanager.MockWindowManager; -import org.dtangler.swingui.windowmanager.DialogManager.DialogResult; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.dependencyengine.DependencyEngineFactory; +import org.hjug.dtangler.core.dependencyengine.MockDependencyEngine; +import org.hjug.dtangler.swingui.dsm.DsmViewFactory; +import org.hjug.dtangler.swingui.dsm.impl.DsmViewFactoryImpl; +import org.hjug.dtangler.swingui.fileinput.FileInputSelection; +import org.hjug.dtangler.swingui.windowmanager.MockDialogManager; +import org.hjug.dtangler.swingui.windowmanager.MockWindowManager; +import org.hjug.dtangler.swingui.windowmanager.DialogManager.DialogResult; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MiscFeatureTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MiscFeatureTest.java similarity index 95% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MiscFeatureTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MiscFeatureTest.java index 691a750..0193835 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MiscFeatureTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MiscFeatureTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -17,19 +17,19 @@ import javax.swing.JList; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependencies; -import org.dtangler.core.dependencies.TestDependable; -import org.dtangler.core.dependencies.TestScope; -import org.dtangler.core.dependencyengine.DependencyEngine; -import org.dtangler.core.dependencyengine.DependencyEngineFactory; -import org.dtangler.core.dependencyengine.MockDependencyEngine; -import org.dtangler.swingui.dsm.DsmViewFactory; -import org.dtangler.swingui.dsm.impl.DsmViewFactoryImpl; -import org.dtangler.swingui.fileinput.FileInputSelection; -import org.dtangler.swingui.windowmanager.MockDialogManager; -import org.dtangler.swingui.windowmanager.MockWindowManager; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.dependencies.TestScope; +import org.hjug.dtangler.core.dependencyengine.DependencyEngine; +import org.hjug.dtangler.core.dependencyengine.DependencyEngineFactory; +import org.hjug.dtangler.core.dependencyengine.MockDependencyEngine; +import org.hjug.dtangler.swingui.dsm.DsmViewFactory; +import org.hjug.dtangler.swingui.dsm.impl.DsmViewFactoryImpl; +import org.hjug.dtangler.swingui.fileinput.FileInputSelection; +import org.hjug.dtangler.swingui.windowmanager.MockDialogManager; +import org.hjug.dtangler.swingui.windowmanager.MockWindowManager; import org.junit.Before; import org.junit.Test; import org.uispec4j.ListBox; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MockAboutInfoDisplayer.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MockAboutInfoDisplayer.java similarity index 77% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MockAboutInfoDisplayer.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MockAboutInfoDisplayer.java index 227fed1..7383543 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MockAboutInfoDisplayer.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MockAboutInfoDisplayer.java @@ -3,9 +3,9 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; -import org.dtangler.swingui.aboutinfodisplayer.AboutInfoDisplayer; +import org.hjug.dtangler.swingui.aboutinfodisplayer.AboutInfoDisplayer; public class MockAboutInfoDisplayer implements AboutInfoDisplayer { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MockDsmGuiModel.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MockDsmGuiModel.java similarity index 76% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MockDsmGuiModel.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MockDsmGuiModel.java index 5528e0a..75ba0da 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MockDsmGuiModel.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MockDsmGuiModel.java @@ -3,20 +3,20 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; import java.util.Collections; import java.util.List; import java.util.Set; -import org.dtangler.core.analysisresult.AnalysisResult; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependency; -import org.dtangler.core.dsm.Dsm; -import org.dtangler.ui.dsm.CellInfo; -import org.dtangler.ui.dsm.DependableInfo; -import org.dtangler.ui.dsm.DsmGuiModel; -import org.dtangler.ui.dsm.DsmGuiModelChangeListener; +import org.hjug.dtangler.core.analysisresult.AnalysisResult; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dsm.Dsm; +import org.hjug.dtangler.ui.dsm.CellInfo; +import org.hjug.dtangler.ui.dsm.DependableInfo; +import org.hjug.dtangler.ui.dsm.DsmGuiModel; +import org.hjug.dtangler.ui.dsm.DsmGuiModelChangeListener; public class MockDsmGuiModel implements DsmGuiModel { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MockFileInputSelector.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MockFileInputSelector.java similarity index 79% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MockFileInputSelector.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MockFileInputSelector.java index 5ba6b53..e60af55 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MockFileInputSelector.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MockFileInputSelector.java @@ -3,10 +3,10 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; -import org.dtangler.swingui.fileinput.FileInputSelection; -import org.dtangler.swingui.fileinput.FileInputSelector; +import org.hjug.dtangler.swingui.fileinput.FileInputSelection; +import org.hjug.dtangler.swingui.fileinput.FileInputSelector; public class MockFileInputSelector implements FileInputSelector { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MockFileSelector.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MockFileSelector.java similarity index 80% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MockFileSelector.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MockFileSelector.java index 91ba705..cf9bdd1 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MockFileSelector.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MockFileSelector.java @@ -4,9 +4,9 @@ // The full license text can be read from: // http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; -import org.dtangler.swingui.fileselector.FileSelector; +import org.hjug.dtangler.swingui.fileselector.FileSelector; public class MockFileSelector implements FileSelector { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MockRulesSelector.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MockRulesSelector.java similarity index 78% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MockRulesSelector.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MockRulesSelector.java index bebdd4d..a3632c0 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/MockRulesSelector.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/MockRulesSelector.java @@ -3,10 +3,10 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.swingui.rulesselector.RulesSelector; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.swingui.rulesselector.RulesSelector; public class MockRulesSelector implements RulesSelector { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/TestableConfigurationModel.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/TestableConfigurationModel.java similarity index 81% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/TestableConfigurationModel.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/TestableConfigurationModel.java index a065435..9098779 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/mainview/impl/TestableConfigurationModel.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/mainview/impl/TestableConfigurationModel.java @@ -3,11 +3,11 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.mainview.impl; +package org.hjug.dtangler.swingui.mainview.impl; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.swingui.fileselector.FileSelector; -import org.dtangler.swingui.windowmanager.DialogManager; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.swingui.fileselector.FileSelector; +import org.hjug.dtangler.swingui.windowmanager.DialogManager; public class TestableConfigurationModel extends ConfigurationModel { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/resource/icons/IconSmokeTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/resource/icons/IconSmokeTest.java similarity index 90% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/resource/icons/IconSmokeTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/resource/icons/IconSmokeTest.java index c14f4c2..fc5e67d 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/resource/icons/IconSmokeTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/resource/icons/IconSmokeTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.resource.icons; +package org.hjug.dtangler.swingui.resource.icons; import static org.junit.Assert.assertNotNull; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/rulememberselector/MockRuleMemberSelector.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulememberselector/MockRuleMemberSelector.java similarity index 91% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/rulememberselector/MockRuleMemberSelector.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulememberselector/MockRuleMemberSelector.java index 8420318..868e044 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/rulememberselector/MockRuleMemberSelector.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulememberselector/MockRuleMemberSelector.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulememberselector; +package org.hjug.dtangler.swingui.rulememberselector; import java.util.List; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberSelectorFeatureTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberSelectorFeatureTest.java similarity index 96% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberSelectorFeatureTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberSelectorFeatureTest.java index 8f98cca..f444161 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberSelectorFeatureTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberSelectorFeatureTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulememberselector.impl; +package org.hjug.dtangler.swingui.rulememberselector.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -17,8 +17,8 @@ import javax.swing.JComboBox; -import org.dtangler.core.exception.DtException; -import org.dtangler.swingui.windowmanager.MockWindowManager; +import org.hjug.dtangler.core.exception.DtException; +import org.hjug.dtangler.swingui.windowmanager.MockWindowManager; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberViewDriver.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberViewDriver.java similarity index 88% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberViewDriver.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberViewDriver.java index 137dcd3..6d01c71 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/rulememberselector/impl/RuleMemberViewDriver.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulememberselector/impl/RuleMemberViewDriver.java @@ -3,9 +3,9 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulememberselector.impl; +package org.hjug.dtangler.swingui.rulememberselector.impl; -import org.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.windowmanager.SwingView; import org.uispec4j.Button; import org.uispec4j.ComboBox; import org.uispec4j.Panel; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/rulesselector/impl/RuleSelectorViewDriver.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulesselector/impl/RuleSelectorViewDriver.java similarity index 94% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/rulesselector/impl/RuleSelectorViewDriver.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulesselector/impl/RuleSelectorViewDriver.java index 2e8378f..7dcbe90 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/rulesselector/impl/RuleSelectorViewDriver.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulesselector/impl/RuleSelectorViewDriver.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulesselector.impl; +package org.hjug.dtangler.swingui.rulesselector.impl; import org.uispec4j.Button; import org.uispec4j.ListBox; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/rulesselector/impl/RulesSelectorFeatureTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesSelectorFeatureTest.java similarity index 97% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/rulesselector/impl/RulesSelectorFeatureTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesSelectorFeatureTest.java index fd996d5..8eeb27f 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/rulesselector/impl/RulesSelectorFeatureTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesSelectorFeatureTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulesselector.impl; +package org.hjug.dtangler.swingui.rulesselector.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -21,12 +21,12 @@ import java.util.Set; import java.util.Map.Entry; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.configuration.Group; -import org.dtangler.swingui.groupselector.MockGroupSelector; -import org.dtangler.swingui.rulememberselector.MockRuleMemberSelector; -import org.dtangler.swingui.rulesselector.RulesSelector; -import org.dtangler.swingui.windowmanager.MockWindowManager; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.configuration.Group; +import org.hjug.dtangler.swingui.groupselector.MockGroupSelector; +import org.hjug.dtangler.swingui.rulememberselector.MockRuleMemberSelector; +import org.hjug.dtangler.swingui.rulesselector.RulesSelector; +import org.hjug.dtangler.swingui.windowmanager.MockWindowManager; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/rulesselector/impl/RulesSelectorViewDriver.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesSelectorViewDriver.java similarity index 91% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/rulesselector/impl/RulesSelectorViewDriver.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesSelectorViewDriver.java index b7edbc4..1eedd6d 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/rulesselector/impl/RulesSelectorViewDriver.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/rulesselector/impl/RulesSelectorViewDriver.java @@ -3,9 +3,9 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.rulesselector.impl; +package org.hjug.dtangler.swingui.rulesselector.impl; -import org.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.windowmanager.SwingView; import org.uispec4j.Button; import org.uispec4j.ListBox; import org.uispec4j.Panel; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/testutil/SnapShotTaker.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/testutil/SnapShotTaker.java similarity index 93% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/testutil/SnapShotTaker.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/testutil/SnapShotTaker.java index ae5083e..7b50529 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/testutil/SnapShotTaker.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/testutil/SnapShotTaker.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.testutil; +package org.hjug.dtangler.swingui.testutil; import java.awt.Component; import java.awt.Dimension; @@ -21,9 +21,9 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; -import org.dtangler.swingui.resource.icons.IconKey; -import org.dtangler.swingui.resource.icons.IconProvider; -import org.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.resource.icons.IconKey; +import org.hjug.dtangler.swingui.resource.icons.IconProvider; +import org.hjug.dtangler.swingui.windowmanager.SwingView; public class SnapShotTaker { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/textinput/MockTextInputSelector.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/textinput/MockTextInputSelector.java similarity index 90% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/textinput/MockTextInputSelector.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/textinput/MockTextInputSelector.java index ce9abd3..46e996b 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/textinput/MockTextInputSelector.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/textinput/MockTextInputSelector.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.textinput; +package org.hjug.dtangler.swingui.textinput; public class MockTextInputSelector implements TextInputSelector { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/textinput/impl/MockTextInputView.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/textinput/impl/MockTextInputView.java similarity index 93% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/textinput/impl/MockTextInputView.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/textinput/impl/MockTextInputView.java index 973551d..58d6cad 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/textinput/impl/MockTextInputView.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/textinput/impl/MockTextInputView.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.textinput.impl; +package org.hjug.dtangler.swingui.textinput.impl; public class MockTextInputView implements TextInputView { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/textinput/impl/TextInputPresenterTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/textinput/impl/TextInputPresenterTest.java similarity index 95% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/textinput/impl/TextInputPresenterTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/textinput/impl/TextInputPresenterTest.java index 00a9cdf..d5b7c55 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/textinput/impl/TextInputPresenterTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/textinput/impl/TextInputPresenterTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.textinput.impl; +package org.hjug.dtangler.swingui.textinput.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/textinput/impl/TextInputSelectorFeatureTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/textinput/impl/TextInputSelectorFeatureTest.java similarity index 92% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/textinput/impl/TextInputSelectorFeatureTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/textinput/impl/TextInputSelectorFeatureTest.java index 8550476..07eb0a5 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/textinput/impl/TextInputSelectorFeatureTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/textinput/impl/TextInputSelectorFeatureTest.java @@ -3,15 +3,15 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.textinput.impl; +package org.hjug.dtangler.swingui.textinput.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import org.dtangler.swingui.textinput.TextInputSelector; -import org.dtangler.swingui.windowmanager.MockWindowManager; +import org.hjug.dtangler.swingui.textinput.TextInputSelector; +import org.hjug.dtangler.swingui.windowmanager.MockWindowManager; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/textinput/impl/TextInputViewDriver.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/textinput/impl/TextInputViewDriver.java similarity index 87% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/textinput/impl/TextInputViewDriver.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/textinput/impl/TextInputViewDriver.java index b48c207..3f9f7d4 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/textinput/impl/TextInputViewDriver.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/textinput/impl/TextInputViewDriver.java @@ -3,9 +3,9 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.textinput.impl; +package org.hjug.dtangler.swingui.textinput.impl; -import org.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.windowmanager.SwingView; import org.uispec4j.Button; import org.uispec4j.Panel; import org.uispec4j.TextBox; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/windowmanager/MockDialogManager.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/windowmanager/MockDialogManager.java similarity index 92% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/windowmanager/MockDialogManager.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/windowmanager/MockDialogManager.java index c79d3b1..5104331 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/windowmanager/MockDialogManager.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/windowmanager/MockDialogManager.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager; +package org.hjug.dtangler.swingui.windowmanager; public class MockDialogManager implements DialogManager { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/windowmanager/MockWindowManager.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/windowmanager/MockWindowManager.java similarity index 95% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/windowmanager/MockWindowManager.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/windowmanager/MockWindowManager.java index 2699d17..7556596 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/windowmanager/MockWindowManager.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/windowmanager/MockWindowManager.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager; +package org.hjug.dtangler.swingui.windowmanager; public class MockWindowManager implements WindowManager, WindowInteractionProvider { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/windowmanager/impl/ErrorDisplayComponentTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/windowmanager/impl/ErrorDisplayComponentTest.java similarity index 96% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/windowmanager/impl/ErrorDisplayComponentTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/windowmanager/impl/ErrorDisplayComponentTest.java index 2745caf..b734aa6 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/windowmanager/impl/ErrorDisplayComponentTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/windowmanager/impl/ErrorDisplayComponentTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager.impl; +package org.hjug.dtangler.swingui.windowmanager.impl; import static org.junit.Assert.assertEquals; diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/windowmanager/impl/MockSwingView.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/windowmanager/impl/MockSwingView.java similarity index 87% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/windowmanager/impl/MockSwingView.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/windowmanager/impl/MockSwingView.java index 46d63d3..26b217e 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/windowmanager/impl/MockSwingView.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/windowmanager/impl/MockSwingView.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager.impl; +package org.hjug.dtangler.swingui.windowmanager.impl; import java.awt.Component; import java.awt.Dimension; @@ -11,8 +11,8 @@ import javax.swing.JComponent; import javax.swing.JMenuBar; -import org.dtangler.swingui.windowmanager.SwingView; -import org.dtangler.swingui.windowmanager.WindowInteractionProvider; +import org.hjug.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.windowmanager.WindowInteractionProvider; public class MockSwingView implements SwingView { diff --git a/dtangler-swingui/src/test/java/org/dtangler/swingui/windowmanager/impl/SwingWindowManagerTest.java b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/windowmanager/impl/SwingWindowManagerTest.java similarity index 96% rename from dtangler-swingui/src/test/java/org/dtangler/swingui/windowmanager/impl/SwingWindowManagerTest.java rename to dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/windowmanager/impl/SwingWindowManagerTest.java index 853ba7e..3c176c2 100644 --- a/dtangler-swingui/src/test/java/org/dtangler/swingui/windowmanager/impl/SwingWindowManagerTest.java +++ b/dtangler-swingui/src/test/java/org/hjug/dtangler/swingui/windowmanager/impl/SwingWindowManagerTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.swingui.windowmanager.impl; +package org.hjug.dtangler.swingui.windowmanager.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -21,7 +21,7 @@ import javax.swing.JLabel; import javax.swing.JMenuBar; -import org.dtangler.swingui.windowmanager.SwingView; +import org.hjug.dtangler.swingui.windowmanager.SwingView; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/dtangler-testdata-cyclic-deps/src/main/java/org/dtangler/core/testutil/cyclic/part1/CyclicA.java b/dtangler-testdata-cyclic-deps/src/main/java/org/hjug/dtangler/core/testutil/cyclic/part1/CyclicA.java similarity index 71% rename from dtangler-testdata-cyclic-deps/src/main/java/org/dtangler/core/testutil/cyclic/part1/CyclicA.java rename to dtangler-testdata-cyclic-deps/src/main/java/org/hjug/dtangler/core/testutil/cyclic/part1/CyclicA.java index a1be598..51641f2 100644 --- a/dtangler-testdata-cyclic-deps/src/main/java/org/dtangler/core/testutil/cyclic/part1/CyclicA.java +++ b/dtangler-testdata-cyclic-deps/src/main/java/org/hjug/dtangler/core/testutil/cyclic/part1/CyclicA.java @@ -3,9 +3,9 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.testutil.cyclic.part1; +package org.hjug.dtangler.core.testutil.cyclic.part1; -import org.dtangler.core.testutil.cyclic.part2.CyclicB; +import org.hjug.dtangler.core.testutil.cyclic.part2.CyclicB; public class CyclicA { diff --git a/dtangler-testdata-cyclic-deps/src/main/java/org/dtangler/core/testutil/cyclic/part2/CyclicB.java b/dtangler-testdata-cyclic-deps/src/main/java/org/hjug/dtangler/core/testutil/cyclic/part2/CyclicB.java similarity index 71% rename from dtangler-testdata-cyclic-deps/src/main/java/org/dtangler/core/testutil/cyclic/part2/CyclicB.java rename to dtangler-testdata-cyclic-deps/src/main/java/org/hjug/dtangler/core/testutil/cyclic/part2/CyclicB.java index 0529785..facf9f9 100644 --- a/dtangler-testdata-cyclic-deps/src/main/java/org/dtangler/core/testutil/cyclic/part2/CyclicB.java +++ b/dtangler-testdata-cyclic-deps/src/main/java/org/hjug/dtangler/core/testutil/cyclic/part2/CyclicB.java @@ -3,9 +3,9 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.testutil.cyclic.part2; +package org.hjug.dtangler.core.testutil.cyclic.part2; -import org.dtangler.core.testutil.cyclic.part1.CyclicA; +import org.hjug.dtangler.core.testutil.cyclic.part1.CyclicA; public class CyclicB { diff --git a/dtangler-testdata-j9/src/main/java/module-info.java b/dtangler-testdata-j9/src/main/java/module-info.java index 8c1a43e..d37bae3 100644 --- a/dtangler-testdata-j9/src/main/java/module-info.java +++ b/dtangler-testdata-j9/src/main/java/module-info.java @@ -1,4 +1,4 @@ module dtangler.testdata.javanine { requires java.base; - exports org.dtangler.javaengine.classfileparser; + exports org.hjug.dtangler.javaengine.classfileparser; } \ No newline at end of file diff --git a/dtangler-testdata-j9/src/main/java/org/dtangler/javaengine/classfileparser/SimpleJava9Class.java b/dtangler-testdata-j9/src/main/java/org/dtangler/javaengine/classfileparser/SimpleJava9Class.java deleted file mode 100644 index a9434b6..0000000 --- a/dtangler-testdata-j9/src/main/java/org/dtangler/javaengine/classfileparser/SimpleJava9Class.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.dtangler.javaengine.classfileparser; - -public class SimpleJava9Class { -} diff --git a/dtangler-testdata-j9/src/main/java/org/hjug/dtangler/javaengine/classfileparser/SimpleJava9Class.java b/dtangler-testdata-j9/src/main/java/org/hjug/dtangler/javaengine/classfileparser/SimpleJava9Class.java new file mode 100644 index 0000000..55fd77c --- /dev/null +++ b/dtangler-testdata-j9/src/main/java/org/hjug/dtangler/javaengine/classfileparser/SimpleJava9Class.java @@ -0,0 +1,4 @@ +package org.hjug.dtangler.javaengine.classfileparser; + +public class SimpleJava9Class { +} diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleEnum.java b/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleEnum.java deleted file mode 100644 index 3ca52a7..0000000 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleEnum.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.dtangler.javaengine.classfileparser.testdata; - -public enum SimpleEnum { - - ZERO, ONE -} diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleAbstractClass.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleAbstractClass.java similarity index 79% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleAbstractClass.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleAbstractClass.java index 15ad829..74d9e6d 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleAbstractClass.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleAbstractClass.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; public abstract class SimpleAbstractClass { diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleAnnotation.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleAnnotation.java similarity index 87% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleAnnotation.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleAnnotation.java index 2915090..a514187 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleAnnotation.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleAnnotation.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleAnnotationDependency.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleAnnotationDependency.java similarity index 81% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleAnnotationDependency.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleAnnotationDependency.java index 5b2258a..295379e 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleAnnotationDependency.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleAnnotationDependency.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; public class SimpleAnnotationDependency { diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleClass.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleClass.java similarity index 77% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleClass.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleClass.java index 413dca0..a926e8f 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleClass.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleClass.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; public class SimpleClass { diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleClassWithInnerClass.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleClassWithInnerClass.java similarity index 80% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleClassWithInnerClass.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleClassWithInnerClass.java index d816d43..9752e49 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleClassWithInnerClass.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleClassWithInnerClass.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; public class SimpleClassWithInnerClass { diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleClassWithPrimitiveFields.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleClassWithPrimitiveFields.java similarity index 86% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleClassWithPrimitiveFields.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleClassWithPrimitiveFields.java index 00efe66..40dc1d6 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleClassWithPrimitiveFields.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleClassWithPrimitiveFields.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; public class SimpleClassWithPrimitiveFields { diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleClassWithStaticInnerClass.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleClassWithStaticInnerClass.java similarity index 81% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleClassWithStaticInnerClass.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleClassWithStaticInnerClass.java index 68eeb15..97335e6 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleClassWithStaticInnerClass.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleClassWithStaticInnerClass.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; public class SimpleClassWithStaticInnerClass { diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleClassWithStaticMethod.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleClassWithStaticMethod.java similarity index 81% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleClassWithStaticMethod.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleClassWithStaticMethod.java index b4d3464..d0931f0 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleClassWithStaticMethod.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleClassWithStaticMethod.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; public class SimpleClassWithStaticMethod { diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleDependenciesInsideMethods.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleDependenciesInsideMethods.java similarity index 84% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleDependenciesInsideMethods.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleDependenciesInsideMethods.java index 0632f6b..2c105fe 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleDependenciesInsideMethods.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleDependenciesInsideMethods.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; public class SimpleDependenciesInsideMethods { diff --git a/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleEnum.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleEnum.java new file mode 100644 index 0000000..0156750 --- /dev/null +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleEnum.java @@ -0,0 +1,6 @@ +package org.hjug.dtangler.javaengine.classfileparser.testdata; + +public enum SimpleEnum { + + ZERO, ONE +} diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleExtendedClass.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleExtendedClass.java similarity index 79% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleExtendedClass.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleExtendedClass.java index 88708e8..0d5f568 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleExtendedClass.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleExtendedClass.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; public class SimpleExtendedClass extends SimpleClass { diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleFieldDependencies.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleFieldDependencies.java similarity index 86% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleFieldDependencies.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleFieldDependencies.java index 8bd4edb..d157067 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleFieldDependencies.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleFieldDependencies.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; import java.util.HashSet; import java.util.Set; diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleInterface.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleInterface.java similarity index 78% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleInterface.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleInterface.java index 222cdca..83e37df 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleInterface.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleInterface.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; public interface SimpleInterface { diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleInvokeDynamic.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleInvokeDynamic.java similarity index 74% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleInvokeDynamic.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleInvokeDynamic.java index 5cee929..81e0357 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleInvokeDynamic.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleInvokeDynamic.java @@ -1,4 +1,4 @@ -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; import java.util.Arrays; import java.util.function.Function; diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleMethodParameterDependencies.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleMethodParameterDependencies.java similarity index 85% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleMethodParameterDependencies.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleMethodParameterDependencies.java index 09fb3b5..74d7163 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleMethodParameterDependencies.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleMethodParameterDependencies.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; public class SimpleMethodParameterDependencies { diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleMethodReturnValueDependencies.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleMethodReturnValueDependencies.java similarity index 85% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleMethodReturnValueDependencies.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleMethodReturnValueDependencies.java index e696295..8155a92 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleMethodReturnValueDependencies.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleMethodReturnValueDependencies.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; public class SimpleMethodReturnValueDependencies { diff --git a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleTemplateDependency.java b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleTemplateDependency.java similarity index 82% rename from dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleTemplateDependency.java rename to dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleTemplateDependency.java index 2ca1c25..c187ddd 100644 --- a/dtangler-testdata-java/src/main/java/org/dtangler/javaengine/classfileparser/testdata/SimpleTemplateDependency.java +++ b/dtangler-testdata-java/src/main/java/org/hjug/dtangler/javaengine/classfileparser/testdata/SimpleTemplateDependency.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.javaengine.classfileparser.testdata; +package org.hjug.dtangler.javaengine.classfileparser.testdata; import java.util.List; diff --git a/dtangler-testutil/src/main/java/org/dtangler/core/dependencies/TestDependable.java b/dtangler-testutil/src/main/java/org/hjug/dtangler/core/dependencies/TestDependable.java similarity index 89% rename from dtangler-testutil/src/main/java/org/dtangler/core/dependencies/TestDependable.java rename to dtangler-testutil/src/main/java/org/hjug/dtangler/core/dependencies/TestDependable.java index 0af252a..ca755af 100644 --- a/dtangler-testutil/src/main/java/org/dtangler/core/dependencies/TestDependable.java +++ b/dtangler-testutil/src/main/java/org/hjug/dtangler/core/dependencies/TestDependable.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencies; +package org.hjug.dtangler.core.dependencies; public class TestDependable extends Dependable { diff --git a/dtangler-testutil/src/main/java/org/dtangler/core/dependencies/TestScope.java b/dtangler-testutil/src/main/java/org/hjug/dtangler/core/dependencies/TestScope.java similarity index 88% rename from dtangler-testutil/src/main/java/org/dtangler/core/dependencies/TestScope.java rename to dtangler-testutil/src/main/java/org/hjug/dtangler/core/dependencies/TestScope.java index 9209bbd..6e2df0c 100644 --- a/dtangler-testutil/src/main/java/org/dtangler/core/dependencies/TestScope.java +++ b/dtangler-testutil/src/main/java/org/hjug/dtangler/core/dependencies/TestScope.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencies; +package org.hjug.dtangler.core.dependencies; public enum TestScope implements Scope { scope1, scope2, scope3; diff --git a/dtangler-testutil/src/main/java/org/dtangler/core/dependencyengine/MockDependencyEngine.java b/dtangler-testutil/src/main/java/org/hjug/dtangler/core/dependencyengine/MockDependencyEngine.java similarity index 84% rename from dtangler-testutil/src/main/java/org/dtangler/core/dependencyengine/MockDependencyEngine.java rename to dtangler-testutil/src/main/java/org/hjug/dtangler/core/dependencyengine/MockDependencyEngine.java index 9a62403..e445af5 100644 --- a/dtangler-testutil/src/main/java/org/dtangler/core/dependencyengine/MockDependencyEngine.java +++ b/dtangler-testutil/src/main/java/org/hjug/dtangler/core/dependencyengine/MockDependencyEngine.java @@ -3,13 +3,13 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.dependencyengine; +package org.hjug.dtangler.core.dependencyengine; import java.util.Arrays; import java.util.List; -import org.dtangler.core.configuration.Arguments; -import org.dtangler.core.dependencies.Dependencies; +import org.hjug.dtangler.core.configuration.Arguments; +import org.hjug.dtangler.core.dependencies.Dependencies; public class MockDependencyEngine extends AbstractDependencyEngine { diff --git a/dtangler-testutil/src/main/java/org/dtangler/core/testutil/dependenciesbuilder/DependencyGraphBuilder.java b/dtangler-testutil/src/main/java/org/hjug/dtangler/core/testutil/dependenciesbuilder/DependencyGraphBuilder.java similarity index 95% rename from dtangler-testutil/src/main/java/org/dtangler/core/testutil/dependenciesbuilder/DependencyGraphBuilder.java rename to dtangler-testutil/src/main/java/org/hjug/dtangler/core/testutil/dependenciesbuilder/DependencyGraphBuilder.java index c4fab8a..86c693a 100644 --- a/dtangler-testutil/src/main/java/org/dtangler/core/testutil/dependenciesbuilder/DependencyGraphBuilder.java +++ b/dtangler-testutil/src/main/java/org/hjug/dtangler/core/testutil/dependenciesbuilder/DependencyGraphBuilder.java @@ -3,11 +3,11 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.core.testutil.dependenciesbuilder; +package org.hjug.dtangler.core.testutil.dependenciesbuilder; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.DependencyGraph; -import org.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.DependencyGraph; +import org.hjug.dtangler.core.dependencies.TestDependable; public class DependencyGraphBuilder { diff --git a/dtangler-ui-testutil/src/main/java/org/dtangler/ui/dsm/MockAnalysisResultInfo.java b/dtangler-ui-testutil/src/main/java/org/hjug/dtangler/ui/dsm/MockAnalysisResultInfo.java similarity index 93% rename from dtangler-ui-testutil/src/main/java/org/dtangler/ui/dsm/MockAnalysisResultInfo.java rename to dtangler-ui-testutil/src/main/java/org/hjug/dtangler/ui/dsm/MockAnalysisResultInfo.java index fb1f481..ff58f22 100644 --- a/dtangler-ui-testutil/src/main/java/org/dtangler/ui/dsm/MockAnalysisResultInfo.java +++ b/dtangler-ui-testutil/src/main/java/org/hjug/dtangler/ui/dsm/MockAnalysisResultInfo.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm; +package org.hjug.dtangler.ui.dsm; public class MockAnalysisResultInfo implements AnalysisResultInfo { diff --git a/dtangler-ui-testutil/src/main/java/org/dtangler/ui/dsm/MockCellInfo.java b/dtangler-ui-testutil/src/main/java/org/hjug/dtangler/ui/dsm/MockCellInfo.java similarity index 96% rename from dtangler-ui-testutil/src/main/java/org/dtangler/ui/dsm/MockCellInfo.java rename to dtangler-ui-testutil/src/main/java/org/hjug/dtangler/ui/dsm/MockCellInfo.java index 85b9d9c..254376b 100644 --- a/dtangler-ui-testutil/src/main/java/org/dtangler/ui/dsm/MockCellInfo.java +++ b/dtangler-ui-testutil/src/main/java/org/hjug/dtangler/ui/dsm/MockCellInfo.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm; +package org.hjug.dtangler.ui.dsm; public class MockCellInfo implements CellInfo { diff --git a/dtangler-ui-testutil/src/main/java/org/dtangler/ui/dsm/MockDependableInfo.java b/dtangler-ui-testutil/src/main/java/org/hjug/dtangler/ui/dsm/MockDependableInfo.java similarity index 96% rename from dtangler-ui-testutil/src/main/java/org/dtangler/ui/dsm/MockDependableInfo.java rename to dtangler-ui-testutil/src/main/java/org/hjug/dtangler/ui/dsm/MockDependableInfo.java index bd0bc40..a45e9fb 100644 --- a/dtangler-ui-testutil/src/main/java/org/dtangler/ui/dsm/MockDependableInfo.java +++ b/dtangler-ui-testutil/src/main/java/org/hjug/dtangler/ui/dsm/MockDependableInfo.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm; +package org.hjug.dtangler.ui.dsm; public class MockDependableInfo implements DependableInfo { diff --git a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/AnalysisResultInfo.java b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/AnalysisResultInfo.java similarity index 89% rename from dtangler-ui/src/main/java/org/dtangler/ui/dsm/AnalysisResultInfo.java rename to dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/AnalysisResultInfo.java index bd5a69c..b60ad11 100644 --- a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/AnalysisResultInfo.java +++ b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/AnalysisResultInfo.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm; +package org.hjug.dtangler.ui.dsm; public interface AnalysisResultInfo { diff --git a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/CellInfo.java b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/CellInfo.java similarity index 91% rename from dtangler-ui/src/main/java/org/dtangler/ui/dsm/CellInfo.java rename to dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/CellInfo.java index 0f8be44..47e424b 100644 --- a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/CellInfo.java +++ b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/CellInfo.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm; +package org.hjug.dtangler.ui.dsm; public interface CellInfo { diff --git a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/DependableInfo.java b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/DependableInfo.java similarity index 92% rename from dtangler-ui/src/main/java/org/dtangler/ui/dsm/DependableInfo.java rename to dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/DependableInfo.java index fd1b412..f3e2997 100644 --- a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/DependableInfo.java +++ b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/DependableInfo.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm; +package org.hjug.dtangler.ui.dsm; public interface DependableInfo { diff --git a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/DsmGuiModel.java b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/DsmGuiModel.java similarity index 79% rename from dtangler-ui/src/main/java/org/dtangler/ui/dsm/DsmGuiModel.java rename to dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/DsmGuiModel.java index 38132bc..fd6fed2 100644 --- a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/DsmGuiModel.java +++ b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/DsmGuiModel.java @@ -3,15 +3,15 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm; +package org.hjug.dtangler.ui.dsm; import java.util.List; import java.util.Set; -import org.dtangler.core.analysisresult.AnalysisResult; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependency; -import org.dtangler.core.dsm.Dsm; +import org.hjug.dtangler.core.analysisresult.AnalysisResult; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dsm.Dsm; public interface DsmGuiModel { diff --git a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/DsmGuiModelChangeListener.java b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/DsmGuiModelChangeListener.java similarity index 89% rename from dtangler-ui/src/main/java/org/dtangler/ui/dsm/DsmGuiModelChangeListener.java rename to dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/DsmGuiModelChangeListener.java index 41dc566..4d372e3 100644 --- a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/DsmGuiModelChangeListener.java +++ b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/DsmGuiModelChangeListener.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm; +package org.hjug.dtangler.ui.dsm; public interface DsmGuiModelChangeListener { diff --git a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/NullCellInfo.java b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/NullCellInfo.java similarity index 95% rename from dtangler-ui/src/main/java/org/dtangler/ui/dsm/NullCellInfo.java rename to dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/NullCellInfo.java index b4e17cd..6a4b378 100644 --- a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/NullCellInfo.java +++ b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/NullCellInfo.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm; +package org.hjug.dtangler.ui.dsm; public class NullCellInfo { diff --git a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/AnalysisResultInfoImpl.java b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/AnalysisResultInfoImpl.java similarity index 86% rename from dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/AnalysisResultInfoImpl.java rename to dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/AnalysisResultInfoImpl.java index 34f50f6..b2b04c9 100644 --- a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/AnalysisResultInfoImpl.java +++ b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/AnalysisResultInfoImpl.java @@ -3,9 +3,9 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm.impl; +package org.hjug.dtangler.ui.dsm.impl; -import org.dtangler.ui.dsm.AnalysisResultInfo; +import org.hjug.dtangler.ui.dsm.AnalysisResultInfo; public class AnalysisResultInfoImpl implements AnalysisResultInfo { diff --git a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/CellInfoImpl.java b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/CellInfoImpl.java similarity index 86% rename from dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/CellInfoImpl.java rename to dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/CellInfoImpl.java index 756853a..3e61d72 100644 --- a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/CellInfoImpl.java +++ b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/CellInfoImpl.java @@ -3,11 +3,11 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm.impl; +package org.hjug.dtangler.ui.dsm.impl; -import org.dtangler.core.dsm.DsmCell; -import org.dtangler.ui.dsm.AnalysisResultInfo; -import org.dtangler.ui.dsm.CellInfo; +import org.hjug.dtangler.core.dsm.DsmCell; +import org.hjug.dtangler.ui.dsm.AnalysisResultInfo; +import org.hjug.dtangler.ui.dsm.CellInfo; public class CellInfoImpl implements CellInfo { diff --git a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/ColumnAndRowSelectionModel.java b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/ColumnAndRowSelectionModel.java similarity index 89% rename from dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/ColumnAndRowSelectionModel.java rename to dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/ColumnAndRowSelectionModel.java index b36e305..32229d9 100644 --- a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/ColumnAndRowSelectionModel.java +++ b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/ColumnAndRowSelectionModel.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm.impl; +package org.hjug.dtangler.ui.dsm.impl; public interface ColumnAndRowSelectionModel { diff --git a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/DependableInfoImpl.java b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/DependableInfoImpl.java similarity index 92% rename from dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/DependableInfoImpl.java rename to dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/DependableInfoImpl.java index bcb48fe..b1f3c0b 100644 --- a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/DependableInfoImpl.java +++ b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/DependableInfoImpl.java @@ -3,10 +3,10 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm.impl; +package org.hjug.dtangler.ui.dsm.impl; -import org.dtangler.core.dsm.DsmRow; -import org.dtangler.ui.dsm.DependableInfo; +import org.hjug.dtangler.core.dsm.DsmRow; +import org.hjug.dtangler.ui.dsm.DependableInfo; public class DependableInfoImpl implements DependableInfo { diff --git a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/DsmGuiModelImpl.java b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/DsmGuiModelImpl.java similarity index 91% rename from dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/DsmGuiModelImpl.java rename to dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/DsmGuiModelImpl.java index a7725dd..32250ba 100644 --- a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/DsmGuiModelImpl.java +++ b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/DsmGuiModelImpl.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm.impl; +package org.hjug.dtangler.ui.dsm.impl; import java.util.ArrayList; import java.util.Collections; @@ -13,18 +13,18 @@ import java.util.Map; import java.util.Set; -import org.dtangler.core.analysisresult.AnalysisResult; -import org.dtangler.core.analysisresult.Violation.Severity; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependency; -import org.dtangler.core.dsm.Dsm; -import org.dtangler.core.dsm.DsmCell; -import org.dtangler.core.dsm.DsmRow; -import org.dtangler.ui.dsm.CellInfo; -import org.dtangler.ui.dsm.DependableInfo; -import org.dtangler.ui.dsm.DsmGuiModel; -import org.dtangler.ui.dsm.DsmGuiModelChangeListener; -import org.dtangler.ui.dsm.NullCellInfo; +import org.hjug.dtangler.core.analysisresult.AnalysisResult; +import org.hjug.dtangler.core.analysisresult.Violation.Severity; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dsm.Dsm; +import org.hjug.dtangler.core.dsm.DsmCell; +import org.hjug.dtangler.core.dsm.DsmRow; +import org.hjug.dtangler.ui.dsm.CellInfo; +import org.hjug.dtangler.ui.dsm.DependableInfo; +import org.hjug.dtangler.ui.dsm.DsmGuiModel; +import org.hjug.dtangler.ui.dsm.DsmGuiModelChangeListener; +import org.hjug.dtangler.ui.dsm.NullCellInfo; public class DsmGuiModelImpl implements DsmGuiModel, ColumnAndRowSelectionModel { diff --git a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/Formatter.java b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/Formatter.java similarity index 86% rename from dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/Formatter.java rename to dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/Formatter.java index a43e7a9..bc2c1fe 100644 --- a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/Formatter.java +++ b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/Formatter.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm.impl; +package org.hjug.dtangler.ui.dsm.impl; public interface Formatter { diff --git a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/PassThroughFormatter.java b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/PassThroughFormatter.java similarity index 89% rename from dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/PassThroughFormatter.java rename to dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/PassThroughFormatter.java index 63f7177..f4ac124 100644 --- a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/PassThroughFormatter.java +++ b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/PassThroughFormatter.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm.impl; +package org.hjug.dtangler.ui.dsm.impl; public class PassThroughFormatter implements Formatter { diff --git a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/ShortenedNameFormatter.java b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/ShortenedNameFormatter.java similarity index 97% rename from dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/ShortenedNameFormatter.java rename to dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/ShortenedNameFormatter.java index faef569..1cc062c 100644 --- a/dtangler-ui/src/main/java/org/dtangler/ui/dsm/impl/ShortenedNameFormatter.java +++ b/dtangler-ui/src/main/java/org/hjug/dtangler/ui/dsm/impl/ShortenedNameFormatter.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm.impl; +package org.hjug.dtangler.ui.dsm.impl; import java.util.ArrayList; import java.util.Collection; diff --git a/dtangler-ui/src/test/java/org/dtangler/ui/dsm/impl/DsmGuiModelImplTest.java b/dtangler-ui/src/test/java/org/hjug/dtangler/ui/dsm/impl/DsmGuiModelImplTest.java similarity index 93% rename from dtangler-ui/src/test/java/org/dtangler/ui/dsm/impl/DsmGuiModelImplTest.java rename to dtangler-ui/src/test/java/org/hjug/dtangler/ui/dsm/impl/DsmGuiModelImplTest.java index 6d6e74e..93d9869 100644 --- a/dtangler-ui/src/test/java/org/dtangler/ui/dsm/impl/DsmGuiModelImplTest.java +++ b/dtangler-ui/src/test/java/org/hjug/dtangler/ui/dsm/impl/DsmGuiModelImplTest.java @@ -3,7 +3,7 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm.impl; +package org.hjug.dtangler.ui.dsm.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -16,14 +16,14 @@ import java.util.List; import java.util.Set; -import org.dtangler.core.analysisresult.AnalysisResult; -import org.dtangler.core.dependencies.Dependable; -import org.dtangler.core.dependencies.Dependency; -import org.dtangler.core.dependencies.TestDependable; -import org.dtangler.core.dsm.Dsm; -import org.dtangler.core.dsm.DsmCell; -import org.dtangler.core.dsm.DsmRow; -import org.dtangler.ui.dsm.DsmGuiModel.DisplayNameFormat; +import org.hjug.dtangler.core.analysisresult.AnalysisResult; +import org.hjug.dtangler.core.dependencies.Dependable; +import org.hjug.dtangler.core.dependencies.Dependency; +import org.hjug.dtangler.core.dependencies.TestDependable; +import org.hjug.dtangler.core.dsm.Dsm; +import org.hjug.dtangler.core.dsm.DsmCell; +import org.hjug.dtangler.core.dsm.DsmRow; +import org.hjug.dtangler.ui.dsm.DsmGuiModel.DisplayNameFormat; import org.junit.Before; import org.junit.Test; diff --git a/dtangler-ui/src/test/java/org/dtangler/ui/dsm/impl/MockModelChangeListener.java b/dtangler-ui/src/test/java/org/hjug/dtangler/ui/dsm/impl/MockModelChangeListener.java similarity index 83% rename from dtangler-ui/src/test/java/org/dtangler/ui/dsm/impl/MockModelChangeListener.java rename to dtangler-ui/src/test/java/org/hjug/dtangler/ui/dsm/impl/MockModelChangeListener.java index 250b5ec..5625581 100644 --- a/dtangler-ui/src/test/java/org/dtangler/ui/dsm/impl/MockModelChangeListener.java +++ b/dtangler-ui/src/test/java/org/hjug/dtangler/ui/dsm/impl/MockModelChangeListener.java @@ -3,9 +3,9 @@ // //The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm.impl; +package org.hjug.dtangler.ui.dsm.impl; -import org.dtangler.ui.dsm.DsmGuiModelChangeListener; +import org.hjug.dtangler.ui.dsm.DsmGuiModelChangeListener; public class MockModelChangeListener implements DsmGuiModelChangeListener { diff --git a/dtangler-ui/src/test/java/org/dtangler/ui/dsm/impl/ShortenedNameFormatterTest.java b/dtangler-ui/src/test/java/org/hjug/dtangler/ui/dsm/impl/ShortenedNameFormatterTest.java similarity index 98% rename from dtangler-ui/src/test/java/org/dtangler/ui/dsm/impl/ShortenedNameFormatterTest.java rename to dtangler-ui/src/test/java/org/hjug/dtangler/ui/dsm/impl/ShortenedNameFormatterTest.java index 0dc4cdc..d017838 100644 --- a/dtangler-ui/src/test/java/org/dtangler/ui/dsm/impl/ShortenedNameFormatterTest.java +++ b/dtangler-ui/src/test/java/org/hjug/dtangler/ui/dsm/impl/ShortenedNameFormatterTest.java @@ -3,7 +3,7 @@ // // The full license text can be read from: http://www.eclipse.org/org/documents/epl-v10.php -package org.dtangler.ui.dsm.impl; +package org.hjug.dtangler.ui.dsm.impl; import static org.junit.Assert.assertEquals; diff --git a/dtangler.all.properties b/dtangler.all.properties index d5dfa65..94c9e91 100644 --- a/dtangler.all.properties +++ b/dtangler.all.properties @@ -3,21 +3,21 @@ cyclesAllowed = false groups = core-java-specific \ contains \ - *org.dtangler.java*,\ - *org.dtangler.java;\ + *org.hjug.dtangler.java*,\ + *org.hjug.dtangler.java;\ project-core \ contains \ *dtangler-core*;\ swingui-submodule-implementation \ contains \ - org.dtangler.swingui.*.impl;\ + org.hjug.dtangler.swingui.*.impl;\ project-ui \ contains \ *dtangler-ui*;\ core-general \ contains \ - *org.dtangler.core*,\ - *org.dtangler.core;\ + *org.hjug.dtangler.core*,\ + *org.hjug.dtangler.core;\ project-swingui \ contains \ *dtangler-swingui* @@ -35,7 +35,7 @@ rules = @core-general \ @project-ui \ cannot depend on \ @project-swingui;\ - org.dtangler.core \ + org.hjug.dtangler.core \ can depend on \ @core-java-specific diff --git a/pom.xml b/pom.xml index d79042a..8e9f28d 100644 --- a/pom.xml +++ b/pom.xml @@ -328,10 +328,10 @@ sign-artifacts - verify sign + verify