You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/06/16 10:41:56 UTC
[05/50] [abbrv] isis git commit: ISIS-1428: removing
Installer#getType(), since not used.
ISIS-1428: removing Installer#getType(), since not used.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f6bf4ea3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f6bf4ea3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f6bf4ea3
Branch: refs/heads/master
Commit: f6bf4ea38bf53f60d9cdbe6e4cbff2d3e5426fe0
Parents: bcb5bc6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 8 07:01:52 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 8 07:01:52 2016 +0100
----------------------------------------------------------------------
.../apache/isis/core/commons/components/Installer.java | 13 -------------
.../core/commons/components/InstallerAbstract.java | 10 +---------
...AuthenticationManagerStandardInstallerAbstract.java | 2 +-
.../AuthorizationManagerStandardInstallerAbstract.java | 2 +-
.../runtime/optionhandler/OptionHandlerAbstract.java | 12 ------------
.../isis/progmodels/dflt/JavaReflectorInstaller.java | 2 +-
.../runtime/fixtures/FixturesInstallerAbstract.java | 2 +-
.../runtime/services/ServicesInstallerAbstract.java | 2 +-
8 files changed, 6 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/metamodel/src/main/java/org/apache/isis/core/commons/components/Installer.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/components/Installer.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/components/Installer.java
index 48badad..80643ad 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/components/Installer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/components/Installer.java
@@ -38,19 +38,6 @@ import java.util.List;
*/
public interface Installer extends ApplicationScopedComponent {
- /**
- * The type of the installer, meaning the component type, and consistent
- * with the long option of the command line flag where applicable.
- *
- * <p>
- * Examples are <tt>authentication</tt> or <tt>persistor</tt>.
- *
- * <p>
- * Because all implementations of a given subinterface of {@link Installer}
- * should return the same value for this method, by convention these
- * subinterfaces define a constant which the implementation can just return.
- */
- String getType();
/**
* The name (qualified by type).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
index a9238ab..f1b0815 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
@@ -30,7 +30,6 @@ public abstract class InstallerAbstract implements Installer {
//region > constructor, fields
- private final String type;
private final String name;
private final IsisConfigurationDefault isisConfiguration;
@@ -45,22 +44,15 @@ public abstract class InstallerAbstract implements Installer {
* to this constructor.
*/
public InstallerAbstract(
- final String type,
final String name,
final IsisConfigurationDefault isisConfiguration) {
- this.type = type;
this.name = name;
this.isisConfiguration = isisConfiguration;
}
//endregion
- //region > type, name
-
- @Override
- public String getType() {
- return type;
- }
+ //region > name
@Override
public String getName() {
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
index 6dc4281..a347048 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
@@ -31,7 +31,7 @@ public abstract class AuthenticationManagerStandardInstallerAbstract extends Ins
public AuthenticationManagerStandardInstallerAbstract(
final String name,
final IsisConfigurationDefault isisConfiguration) {
- super(AuthenticationManagerInstaller.TYPE, name, isisConfiguration);
+ super(name, isisConfiguration);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java
index 020a588..c7a40e2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java
@@ -33,7 +33,7 @@ public abstract class AuthorizationManagerStandardInstallerAbstract
public AuthorizationManagerStandardInstallerAbstract(
final String name,
final IsisConfigurationDefault isisConfiguration) {
- super(AuthorizationManagerInstaller.TYPE, name, isisConfiguration);
+ super(name, isisConfiguration);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java
index da71920..07cf179 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.commons.cli.CommandLine;
-import org.apache.isis.core.commons.components.Installer;
import org.apache.isis.core.commons.lang.ListExtensions;
public abstract class OptionHandlerAbstract implements OptionHandler {
@@ -32,17 +31,6 @@ public abstract class OptionHandlerAbstract implements OptionHandler {
public OptionHandlerAbstract() {
}
- protected StringBuffer availableInstallers(final Object[] factories) {
- final StringBuffer types = new StringBuffer();
- for (int i = 0; i < factories.length; i++) {
- if (i > 0) {
- types.append("; ");
- }
- types.append(((Installer) factories[i]).getName());
- }
- return types;
- }
-
protected List<String> getOptionValues(final CommandLine commandLine, final String opt) {
final List<String> list = new ArrayList<String>();
final String[] optionValues = commandLine.getOptionValues(opt);
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
index fb4677d..a8467f4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
@@ -60,7 +60,7 @@ public class JavaReflectorInstaller extends InstallerAbstract implements Specifi
}
public JavaReflectorInstaller(final String name, final IsisConfigurationDefault isisConfiguration) {
- super(SpecificationLoaderInstaller.TYPE, name, isisConfiguration);
+ super(name, isisConfiguration);
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java
index 455171c..a2e15b4 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java
@@ -33,7 +33,7 @@ public abstract class FixturesInstallerAbstract extends InstallerAbstract implem
private LogonFixture logonFixture;
public FixturesInstallerAbstract(final String name, final IsisConfigurationDefault isisConfiguration) {
- super(FixturesInstaller.TYPE, name, isisConfiguration);
+ super(name, isisConfiguration);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerAbstract.java
index ec9a92b..ff4e0e2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerAbstract.java
@@ -27,7 +27,7 @@ public abstract class ServicesInstallerAbstract extends InstallerAbstract implem
public ServicesInstallerAbstract(
final String name,
final IsisConfigurationDefault isisConfiguration) {
- super(ServicesInstaller.TYPE, name, isisConfiguration);
+ super(name, isisConfiguration);
}
}