Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/help/file/SimpleHelpManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/help/file/SimpleHelpManagerTest.java?rev=1056119&r1=1056118&r2=1056119&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/help/file/SimpleHelpManagerTest.java
(original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/help/file/SimpleHelpManagerTest.java
Thu Jan 6 23:29:07 2011
@@ -29,7 +29,7 @@ import junit.framework.TestCase;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.core.runtime.help.file.FileBasedHelpManager;
+import org.apache.isis.core.progmodel.facetdecorators.help.file.internal.HelpManagerUsingFiles;
public class SimpleHelpManagerTest extends TestCase {
@@ -138,7 +138,7 @@ public class SimpleHelpManagerTest exten
public void testMessageForFileError() {
final Identifier identifier = Identifier.propertyOrCollectionIdentifier("cls", "fld2");
- final FileBasedHelpManager manager = new FileBasedHelpManager(new PropertiesConfiguration())
{
+ final HelpManagerUsingFiles manager = new HelpManagerUsingFiles(new PropertiesConfiguration())
{
@Override
protected BufferedReader getReader() throws FileNotFoundException {
throw new FileNotFoundException("not found");
@@ -185,7 +185,7 @@ public class SimpleHelpManagerTest exten
}
}
-class TestHelpManager extends FileBasedHelpManager {
+class TestHelpManager extends HelpManagerUsingFiles {
public TestHelpManager(IsisConfiguration configuration) {
super(configuration);
}
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/transaction/messagebroker/MessageBrokerNoopInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/transaction/messagebroker/MessageBrokerNoopInstaller.java?rev=1056119&r1=1056118&r2=1056119&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/transaction/messagebroker/MessageBrokerNoopInstaller.java
(original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/transaction/messagebroker/MessageBrokerNoopInstaller.java
Thu Jan 6 23:29:07 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.tra
import java.util.List;
-import org.apache.isis.core.runtime.installers.InstallerAbstract;
+import org.apache.isis.core.metamodel.config.InstallerAbstract;
import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker;
import org.apache.isis.core.runtime.transaction.messagebroker.MessageBrokerInstaller;
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java?rev=1056119&r1=1056118&r2=1056119&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java
(original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java
Thu Jan 6 23:29:07 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.webserver.e
import java.util.List;
-import org.apache.isis.core.runtime.installers.InstallerAbstract;
+import org.apache.isis.core.metamodel.config.InstallerAbstract;
import org.apache.isis.core.runtime.viewer.IsisViewerInstaller;
import org.apache.isis.core.runtime.web.EmbeddedWebServer;
import org.apache.isis.core.runtime.web.EmbeddedWebServerInstaller;
Modified: incubator/isis/trunk/defaults/profilestore/src/main/java/org/apache/isis/defaults/profilestore/InMemoryUserProfileStoreInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/profilestore/src/main/java/org/apache/isis/defaults/profilestore/InMemoryUserProfileStoreInstaller.java?rev=1056119&r1=1056118&r2=1056119&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/profilestore/src/main/java/org/apache/isis/defaults/profilestore/InMemoryUserProfileStoreInstaller.java
(original)
+++ incubator/isis/trunk/defaults/profilestore/src/main/java/org/apache/isis/defaults/profilestore/InMemoryUserProfileStoreInstaller.java
Thu Jan 6 23:29:07 2011
@@ -22,8 +22,8 @@ package org.apache.isis.defaults.profile
import java.util.List;
+import org.apache.isis.core.metamodel.config.InstallerAbstract;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.core.runtime.installers.InstallerAbstract;
import org.apache.isis.core.runtime.userprofile.UserProfileStore;
import org.apache.isis.core.runtime.userprofile.UserProfileStoreInstaller;
Modified: incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java?rev=1056119&r1=1056118&r2=1056119&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java
(original)
+++ incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java
Thu Jan 6 23:29:07 2011
@@ -31,6 +31,7 @@ import com.google.common.collect.Lists;
import org.apache.isis.core.commons.factory.InstanceFactory;
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.InstallerAbstract;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetFactory;
import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
@@ -47,7 +48,6 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
-import org.apache.isis.core.runtime.installers.InstallerAbstract;
import org.apache.isis.core.runtime.installers.InstallerLookup;
import org.apache.isis.core.runtime.installers.InstallerLookupAware;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBinding.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBinding.java?rev=1056119&r1=1056118&r2=1056119&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBinding.java
(original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/CellBinding.java
Thu Jan 6 23:29:07 2011
@@ -176,7 +176,7 @@ public abstract class CellBinding {
public void captureCurrent(final ScenarioCell cell) {
final ScenarioCell previousCell = getCurrentCell();
setCurrentCell(cell);
- boolean shouldDitto = StringUtils.emptyString(cell.getText());
+ boolean shouldDitto = StringUtils.isNullOrEmpty(cell.getText());
boolean canDitto = isDitto() && previousCell != null;
if (shouldDitto && canDitto) {
ditto(previousCell);
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java?rev=1056119&r1=1056118&r2=1056119&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java
(original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingIsisViewerPeer.java
Thu Jan 6 23:29:07 2011
@@ -210,7 +210,7 @@ public class UsingIsisViewerPeer extends
final ScenarioCell onMemberCell = onMemberBinding.getCurrentCell();
final String onMember = onMemberCell.getText();
- if (StringUtils.emptyString(onMember)) {
+ if (StringUtils.isNullOrEmpty(onMember)) {
throw ScenarioBoundValueException.current(onMemberBinding, "(required)");
}
@@ -279,7 +279,7 @@ public class UsingIsisViewerPeer extends
}
private void aliasResultFromPerformCommand(Perform performCommand, String aliasAs) throws
ScenarioBoundValueException {
- if (StringUtils.emptyString(aliasAs)) {
+ if (StringUtils.isNullOrEmpty(aliasAs)) {
return;
}
final ObjectAdapter resultAdapter = performCommand.getResult();
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/ProposedArgumentValidityAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/ProposedArgumentValidityAbstract.java?rev=1056119&r1=1056118&r2=1056119&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/ProposedArgumentValidityAbstract.java
(original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/ProposedArgumentValidityAbstract.java
Thu Jan 6 23:29:07 2011
@@ -34,7 +34,7 @@ public abstract class ProposedArgumentVa
final ScenarioCell arg0Cell = arg0Binding.getCurrentCell();
final String toValidate = arg0Cell.getText();
- if (StringUtils.emptyString(toValidate)) {
+ if (StringUtils.isNullOrEmpty(toValidate)) {
throw ScenarioBoundValueException.current(arg0Binding, "(required)");
}
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java?rev=1056119&r1=1056118&r2=1056119&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java
(original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/Contains.java
Thu Jan 6 23:29:07 2011
@@ -36,7 +36,7 @@ public class Contains extends ThatSubcom
// see if matches null
if (resultAdapter == null) {
- if (StringUtils.emptyString(expected)) {
+ if (StringUtils.isNullOrEmpty(expected)) {
return resultAdapter;
}
throw ScenarioBoundValueException.current(arg0Binding, "(is null)");
@@ -44,7 +44,7 @@ public class Contains extends ThatSubcom
final String resultTitle = resultAdapter.titleString();
- if (!StringUtils.emptyString(expected)) {
+ if (!StringUtils.isNullOrEmpty(expected)) {
// see if expected matches an alias
final ObjectAdapter expectedAdapter = performContext.getPeer().getAliasRegistry().getAliased(expected);
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/DoesNotContain.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/DoesNotContain.java?rev=1056119&r1=1056118&r2=1056119&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/DoesNotContain.java
(original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/property/DoesNotContain.java
Thu Jan 6 23:29:07 2011
@@ -37,7 +37,7 @@ public class DoesNotContain extends That
final String resultTitle = resultAdapter.titleString();
- if (!StringUtils.emptyString(expected)) {
+ if (!StringUtils.isNullOrEmpty(expected)) {
// see if expected matches an alias
final ObjectAdapter expectedAdapter = performContext.getPeer().getAliasRegistry().getAliased(expected);
Modified: incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/SetUpObjectsForFitNesse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/SetUpObjectsForFitNesse.java?rev=1056119&r1=1056118&r2=1056119&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/SetUpObjectsForFitNesse.java
(original)
+++ incubator/isis/trunk/viewer/bdd/fitnesse/src/main/java/net/sf/isiscontrib/bdd/fitnesse/internal/fixtures/SetUpObjectsForFitNesse.java
Thu Jan 6 23:29:07 2011
@@ -147,7 +147,7 @@ public class SetUpObjectsForFitNesse ext
final Parse aliasCell = FitnesseUtil.cell(row, aliasColumn);
if (aliasCell != null) {
String alias = aliasCell.text();
- if (StringUtils.emptyString(alias)) {
+ if (StringUtils.isNullOrEmpty(alias)) {
alias = getPeer().aliasFor(adapter);
FitnesseUtil.setBody(aliasCell, Fixture.gray(alias));
} else {
|