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 2012/01/22 18:08:05 UTC
svn commit: r1234550 [9/15] - in /incubator/isis/trunk/framework: ./
applib/src/main/java/org/apache/isis/applib/clock/
applib/src/main/java/org/apache/isis/applib/fixtures/
applib/src/main/java/org/apache/isis/applib/value/
applib/src/test/java/org/ap...
Modified: incubator/isis/trunk/framework/security/sql/src/test/java/org/apache/isis/security/sql/authentication/SqlAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/security/sql/src/test/java/org/apache/isis/security/sql/authentication/SqlAuthenticatorTest.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/security/sql/src/test/java/org/apache/isis/security/sql/authentication/SqlAuthenticatorTest.java (original)
+++ incubator/isis/trunk/framework/security/sql/src/test/java/org/apache/isis/security/sql/authentication/SqlAuthenticatorTest.java Sun Jan 22 17:07:22 2012
@@ -21,14 +21,15 @@ package org.apache.isis.security.sql.aut
import java.util.Properties;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+
public class SqlAuthenticatorTest {
IsisConfigurationDefault configuration;
SqlAuthenticator saipSqlAuthenticator;
Modified: incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml (original)
+++ incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml Sun Jan 22 17:07:22 2012
@@ -3730,7 +3730,21 @@ public class FooBar {
<sect2>
<title>Fix Line Endings and Subversion Properties</title>
- <para>The </para>
+ <para>All Isis code should be saved with UNIX line endings; for
+ contributors that use Windows, the <command>dos2unix</command>
+ command should be used to convert line endings.</para>
+
+ <para>In addition, the <varname>svn:eol-style</varname> property
+ should be set to <classname>native</classname>, and
+ <varname>svn:mime-type</varname> property should be set
+ appropriately, as per this <ulink
+ url="http://www.apache.org/dev/version-control.html#https-svn-config">Apache
+ guidance</ulink>,</para>
+
+ <para>Both line endings and Subversion properties can be set by
+ running the provided script:</para>
+
+ <programlisting>$ ./fix-lineendings-and-svnprops.sh</programlisting>
</sect2>
<sect2>
@@ -3810,11 +3824,11 @@ public class FooBar {
resources.txt site.vm \
*.project *.classpath *.launch *.importorder \
*.java.hsp \
- *.ucd *.ucls \
+ *.ucd *.ucls *.euml2 *.umlproject \
fop-cust.xsl html-cust.xsl *.ent *.dtd *.pdn catalog.xml \
*.mod usage.txt screen.css docbook.cat \
org.apache.isis.viewer.wicket.ui.ComponentFactory \
- fixture-data test.data example.ldif slapd.conf \
+ *.json fixture-data test.data example.ldif slapd.conf \
.plxarc MANIFEST.MF \
.log \
>/tmp/rat.txt</programlisting>
@@ -3834,6 +3848,11 @@ public class FooBar {
</listitem>
<listitem>
+ <para><filename>.json</filename> are test JSON files (JSON does
+ not support comments)</para>
+ </listitem>
+
+ <listitem>
<para><filename>.java.hsp</filename> are the <ulink
url="http://www.headwaysoftware.com/products/?code=Structure101">Structure101</ulink>
project files</para>
@@ -3842,7 +3861,9 @@ public class FooBar {
<listitem>
<para><filename>.ucd</filename> and <filename>.ucls</filename>
are <ulink url="http://www.soyatec.com/euml2/">Soyatec
- (<acronym>UML</acronym> plugin)</ulink> project files</para>
+ (<acronym>UML</acronym> plugin)</ulink> project files,
+ <filename>.euml2</filename> and <filename>.umlproject</filename>
+ are similar</para>
</listitem>
<listitem>
@@ -3857,7 +3878,7 @@ public class FooBar {
</listitem>
<listitem>
- <para><filename>fixture-data test.data example.ldif
+ <para><filename>*.json, fixture-data, test.data, example.ldif,
slapd.conf</filename> are test resource files</para>
</listitem>
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java Sun Jan 22 17:07:22 2012
@@ -28,6 +28,9 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
import org.apache.isis.applib.fixtures.LogonFixture;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
@@ -58,9 +61,6 @@ import org.apache.isis.viewer.bdd.common
import org.apache.isis.viewer.bdd.common.story.registries.AliasRegistryDefault;
import org.apache.isis.viewer.bdd.common.story.registries.AliasRegistryHolder;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
/**
* Holds the bootstrapped {@link IsisSystem} and provides access to the
* {@link AliasRegistry aliases}.
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddAuthenticationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddAuthenticationManagerInstaller.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddAuthenticationManagerInstaller.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddAuthenticationManagerInstaller.java Sun Jan 22 17:07:22 2012
@@ -20,13 +20,13 @@ package org.apache.isis.viewer.bdd.commo
import java.util.List;
+import com.google.common.collect.Lists;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.standard.Authenticator;
import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManagerStandardInstallerAbstractForDfltRuntime;
import org.apache.isis.security.dflt.authentication.AuthenticatorNoop;
-import com.google.common.collect.Lists;
-
public class BddAuthenticationManagerInstaller extends AuthenticationManagerStandardInstallerAbstractForDfltRuntime {
public BddAuthenticationManagerInstaller() {
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddObjectStorePersistedObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddObjectStorePersistedObjects.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddObjectStorePersistedObjects.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/BddObjectStorePersistedObjects.java Sun Jan 22 17:07:22 2012
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.bdd.commo
import java.util.HashMap;
import java.util.Map;
+import com.google.common.collect.Iterables;
+
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.facets.object.cached.CachedFacet;
@@ -29,8 +31,6 @@ import org.apache.isis.runtimes.dflt.obj
import org.apache.isis.runtimes.dflt.objectstores.dflt.internal.ObjectStorePersistedObjects;
import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;
-import com.google.common.collect.Iterables;
-
/**
* Stores instances in one of two maps, based on whether have their
* specification has the {@link CachedFacet} (represents cached or reference
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractListFixturePeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractListFixturePeer.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractListFixturePeer.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractListFixturePeer.java Sun Jan 22 17:07:22 2012
@@ -21,14 +21,14 @@ package org.apache.isis.viewer.bdd.commo
import java.util.ArrayList;
import java.util.List;
+import com.google.common.collect.Iterables;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.viewer.bdd.common.AliasRegistry;
import org.apache.isis.viewer.bdd.common.CellBinding;
import org.apache.isis.viewer.bdd.common.ScenarioValueException;
-import com.google.common.collect.Iterables;
-
public class AbstractListFixturePeer extends AbstractFixturePeer {
private final String listAlias;
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/test/java/org/apache/isis/viewer/bdd/common/registries/AliasesRegistryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/test/java/org/apache/isis/viewer/bdd/common/registries/AliasesRegistryTest.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/test/java/org/apache/isis/viewer/bdd/common/registries/AliasesRegistryTest.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/test/java/org/apache/isis/viewer/bdd/common/registries/AliasesRegistryTest.java Sun Jan 22 17:07:22 2012
@@ -18,8 +18,6 @@
*/
package org.apache.isis.viewer.bdd.common.registries;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.viewer.bdd.common.story.registries.AliasRegistryDefault;
import org.hamcrest.CoreMatchers;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
@@ -29,6 +27,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.viewer.bdd.common.story.registries.AliasRegistryDefault;
+
@RunWith(JMock.class)
public class AliasesRegistryTest {
Modified: incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionScenario.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionScenario.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionScenario.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionScenario.java Sun Jan 22 17:07:22 2012
@@ -27,6 +27,15 @@ import java.io.InputStream;
import java.util.Collections;
import java.util.List;
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
+
+import org.concordion.Concordion;
+import org.concordion.api.ResultSummary;
+import org.concordion.internal.ConcordionBuilder;
+import org.concordion.internal.FileTarget;
+import org.junit.Test;
+
import org.apache.isis.core.commons.lang.IoUtils;
import org.apache.isis.core.commons.lang.StringUtils;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -42,14 +51,6 @@ import org.apache.isis.viewer.bdd.concor
import org.apache.isis.viewer.bdd.concordion.internal.fixtures.CheckListForConcordion;
import org.apache.isis.viewer.bdd.concordion.internal.fixtures.SetUpObjectsForConcordion;
import org.apache.isis.viewer.bdd.concordion.internal.fixtures.UsingIsisViewerForConcordion;
-import org.concordion.Concordion;
-import org.concordion.api.ResultSummary;
-import org.concordion.internal.ConcordionBuilder;
-import org.concordion.internal.FileTarget;
-import org.junit.Test;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
public abstract class AbstractIsisConcordionScenario {
Modified: incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/internal/fixtures/UsingIsisViewerForConcordion.java Sun Jan 22 17:07:22 2012
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.bdd.conco
import java.util.ArrayList;
import java.util.List;
+import com.google.common.collect.Lists;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
@@ -35,8 +37,6 @@ import org.apache.isis.viewer.bdd.common
import org.apache.isis.viewer.bdd.common.fixtures.perform.Perform;
import org.apache.isis.viewer.bdd.common.parsers.DateParser;
-import com.google.common.collect.Lists;
-
public class UsingIsisViewerForConcordion extends AbstractFixture<UsingIsisViewerPeer> {
public UsingIsisViewerForConcordion(final AliasRegistry aliasesRegistry, final DeploymentType deploymentType, final DateParser dateParser, final Perform.Mode mode) {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java Sun Jan 22 17:07:22 2012
@@ -22,6 +22,8 @@ package org.apache.isis.viewer.dnd;
import java.awt.Dimension;
import java.util.StringTokenizer;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfigurationException;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -95,7 +97,6 @@ import org.apache.isis.viewer.dnd.viewer
import org.apache.isis.viewer.dnd.viewer.basic.InnerWorkspaceSpecification;
import org.apache.isis.viewer.dnd.viewer.basic.RootWorkspaceSpecification;
import org.apache.isis.viewer.dnd.viewer.basic.WrappedTextFieldSpecification;
-import org.apache.log4j.Logger;
public class DndViewer extends IsisViewerAbstract {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java Sun Jan 22 17:07:22 2012
@@ -24,12 +24,13 @@ import java.awt.FontMetrics;
import java.awt.Frame;
import java.util.StringTokenizer;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
import org.apache.isis.viewer.dnd.drawing.Text;
import org.apache.isis.viewer.dnd.util.Properties;
-import org.apache.log4j.Logger;
public class AwtText implements Text {
private static final String ASCENT_ADJUST = Properties.PROPERTY_BASE + "ascent-adjust";
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java Sun Jan 22 17:07:22 2012
@@ -43,10 +43,11 @@ import java.awt.event.WindowEvent;
import java.net.URL;
import java.util.Vector;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.viewer.dnd.view.debug.DebugOutput;
-import org.apache.log4j.Logger;
/**
* A specialised frame for displaying the details of an object and its display
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java Sun Jan 22 17:07:22 2012
@@ -27,6 +27,8 @@ import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.interaction.ClickImpl;
@@ -40,7 +42,6 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.ViewAreaType;
import org.apache.isis.viewer.dnd.view.base.AbstractView;
import org.apache.isis.viewer.dnd.view.content.NullContent;
-import org.apache.log4j.Logger;
public class InteractionHandler implements MouseMotionListener, MouseListener, KeyListener {
private static final Logger LOG = Logger.getLogger(InteractionHandler.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java Sun Jan 22 17:07:22 2012
@@ -22,13 +22,14 @@ package org.apache.isis.viewer.dnd.awt;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.interaction.KeyboardActionImpl;
import org.apache.isis.viewer.dnd.view.FocusManager;
import org.apache.isis.viewer.dnd.view.KeyboardAction;
import org.apache.isis.viewer.dnd.view.View;
-import org.apache.log4j.Logger;
public class KeyboardManager {
private static final Logger LOG = Logger.getLogger(KeyboardManager.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java Sun Jan 22 17:07:22 2012
@@ -38,11 +38,12 @@ import java.awt.event.KeyListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.lang.StringUtils;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.log4j.Logger;
public class LoginDialog extends Frame implements ActionListener, KeyListener {
private static final long serialVersionUID = 1L;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java Sun Jan 22 17:07:22 2012
@@ -33,6 +33,8 @@ import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ToString;
@@ -71,7 +73,6 @@ import org.apache.isis.viewer.dnd.view.d
import org.apache.isis.viewer.dnd.view.menu.PopupMenuContainer;
import org.apache.isis.viewer.dnd.view.message.MessageContent;
import org.apache.isis.viewer.dnd.viewer.ApplicationOptions;
-import org.apache.log4j.Logger;
public class XViewer implements Viewer {
private static final Size NO_SIZE = new Size(0, 0);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java Sun Jan 22 17:07:22 2012
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.dnd.calendar;
+import org.apache.log4j.Logger;
+
import org.apache.isis.viewer.dnd.drawing.Bounds;
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.drawing.Size;
@@ -33,7 +35,6 @@ import org.apache.isis.viewer.dnd.view.c
import org.apache.isis.viewer.dnd.view.content.NullContent;
import org.apache.isis.viewer.dnd.view.control.AbstractButtonAction;
import org.apache.isis.viewer.dnd.view.control.Button;
-import org.apache.log4j.Logger;
public class CalendarView extends CompositeView {
private static final Logger LOG = Logger.getLogger(CalendarView.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java Sun Jan 22 17:07:22 2012
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.dnd.dialog;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.Veto;
@@ -48,7 +50,6 @@ import org.apache.isis.viewer.dnd.view.c
import org.apache.isis.viewer.dnd.view.composite.StackLayout;
import org.apache.isis.viewer.dnd.view.control.AbstractButtonAction;
import org.apache.isis.viewer.dnd.view.control.CancelAction;
-import org.apache.log4j.Logger;
public class ActionDialogSpecification extends CompositeViewSpecification {
private static final Logger LOG = Logger.getLogger(ActionDialogSpecification.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java Sun Jan 22 17:07:22 2012
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.dnd.dialog;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -32,7 +34,6 @@ import org.apache.isis.viewer.dnd.view.a
import org.apache.isis.viewer.dnd.view.action.ParameterContent;
import org.apache.isis.viewer.dnd.view.action.TextParseableParameter;
import org.apache.isis.viewer.dnd.view.composite.AbstractViewBuilder;
-import org.apache.log4j.Logger;
public class ActionFieldBuilder extends AbstractViewBuilder {
private static final Logger LOG = Logger.getLogger(ActionFieldBuilder.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java Sun Jan 22 17:07:22 2012
@@ -28,6 +28,8 @@ import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.io.File;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.progmodel.facets.value.image.ImageValueFacet;
@@ -50,7 +52,6 @@ import org.apache.isis.viewer.dnd.view.b
import org.apache.isis.viewer.dnd.view.content.FieldContent;
import org.apache.isis.viewer.dnd.view.field.OneToOneField;
import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
-import org.apache.log4j.Logger;
public class ImageField extends AbstractField {
public static class Specification extends AbstractFieldSpecification {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/TextField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/TextField.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/TextField.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/TextField.java Sun Jan 22 17:07:22 2012
@@ -22,6 +22,8 @@ package org.apache.isis.viewer.dnd.field
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -52,7 +54,6 @@ import org.apache.isis.viewer.dnd.view.t
import org.apache.isis.viewer.dnd.view.text.TextBlockTarget;
import org.apache.isis.viewer.dnd.view.text.TextContent;
import org.apache.isis.viewer.dnd.view.text.TextSelection;
-import org.apache.log4j.Logger;
public abstract class TextField extends TextParseableFieldAbstract implements TextBlockTarget {
private static final Logger LOG = Logger.getLogger(TextField.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/TextParseableFieldAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/TextParseableFieldAbstract.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/TextParseableFieldAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/TextParseableFieldAbstract.java Sun Jan 22 17:07:22 2012
@@ -19,12 +19,13 @@
package org.apache.isis.viewer.dnd.field;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.viewer.dnd.view.Content;
import org.apache.isis.viewer.dnd.view.ViewSpecification;
import org.apache.isis.viewer.dnd.view.content.TextParseableContent;
-import org.apache.log4j.Logger;
public abstract class TextParseableFieldAbstract extends AbstractField {
private static final Logger LOG = Logger.getLogger(TextField.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/WrappedTextField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/WrappedTextField.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/WrappedTextField.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/field/WrappedTextField.java Sun Jan 22 17:07:22 2012
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.dnd.field;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.viewer.dnd.drawing.Canvas;
import org.apache.isis.viewer.dnd.drawing.Color;
@@ -29,7 +31,6 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.content.TextParseableContent;
import org.apache.isis.viewer.dnd.view.text.CursorPosition;
import org.apache.isis.viewer.dnd.view.text.TextContent;
-import org.apache.log4j.Logger;
public class WrappedTextField extends TextField {
private static final Logger LOG = Logger.getLogger(WrappedTextField.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/help/ExternalHelpViewerProgram.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/help/ExternalHelpViewerProgram.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/help/ExternalHelpViewerProgram.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/help/ExternalHelpViewerProgram.java Sun Jan 22 17:07:22 2012
@@ -21,9 +21,10 @@ package org.apache.isis.viewer.dnd.help;
import java.io.IOException;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.viewer.dnd.drawing.Location;
-import org.apache.log4j.Logger;
public class ExternalHelpViewerProgram implements HelpViewer {
private static final Logger LOG = Logger.getLogger(ExternalHelpViewerProgram.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableAxisImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableAxisImpl.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableAxisImpl.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableAxisImpl.java Sun Jan 22 17:07:22 2012
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.dnd.table
import java.util.List;
+import com.google.common.collect.Lists;
+
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
@@ -29,8 +31,6 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.collection.CollectionContent;
-import com.google.common.collect.Lists;
-
public class TableAxisImpl implements TableAxis {
private final List<ObjectAssociation> columns;
private final String[] columnName;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java Sun Jan 22 17:07:22 2012
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.dnd.table;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
@@ -46,7 +48,6 @@ import org.apache.isis.viewer.dnd.view.c
import org.apache.isis.viewer.dnd.view.field.OneToOneFieldImpl;
import org.apache.isis.viewer.dnd.view.field.TextParseableFieldImpl;
import org.apache.isis.viewer.dnd.viewer.basic.UnlinedTextFieldSpecification;
-import org.apache.log4j.Logger;
class TableCellBuilder extends AbstractViewBuilder {
private static final Logger LOG = Logger.getLogger(TableCellBuilder.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java Sun Jan 22 17:07:22 2012
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.dnd.tree;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
@@ -56,7 +58,6 @@ import org.apache.isis.viewer.dnd.view.f
import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
import org.apache.isis.viewer.dnd.view.text.ObjectTitleText;
import org.apache.isis.viewer.dnd.view.text.TitleText;
-import org.apache.log4j.Logger;
// TODO use ObjectBorder to provide the basic border functionality
public class TreeNodeBorder extends AbstractBorder {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java Sun Jan 22 17:07:22 2012
@@ -22,9 +22,10 @@ package org.apache.isis.viewer.dnd.view;
import java.util.HashMap;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.viewer.dnd.util.ViewerException;
-import org.apache.log4j.Logger;
public class Axes {
private static final Logger LOG = Logger.getLogger(Axes.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java Sun Jan 22 17:07:22 2012
@@ -19,10 +19,11 @@
package org.apache.isis.viewer.dnd.view.action;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.exceptions.IsisApplicationException;
import org.apache.isis.viewer.dnd.view.BackgroundTask;
import org.apache.isis.viewer.dnd.view.View;
-import org.apache.log4j.Logger;
public final class BackgroundWork {
private static final Logger LOG = Logger.getLogger(BackgroundTask.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java Sun Jan 22 17:07:22 2012
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.dnd.view.
import java.util.Enumeration;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -70,7 +72,6 @@ import org.apache.isis.viewer.dnd.view.c
import org.apache.isis.viewer.dnd.view.content.RootObject;
import org.apache.isis.viewer.dnd.view.option.OpenViewOption;
import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
-import org.apache.log4j.Logger;
public abstract class AbstractView implements View {
private static final Logger LOG = Logger.getLogger(AbstractView.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java Sun Jan 22 17:07:22 2012
@@ -25,6 +25,8 @@ import java.util.Hashtable;
import java.util.List;
import java.util.Vector;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -38,7 +40,6 @@ import org.apache.isis.viewer.dnd.view.O
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.ViewUpdateNotifier;
import org.apache.isis.viewer.dnd.view.collection.RootCollection;
-import org.apache.log4j.Logger;
public class ViewUpdateNotifierImpl implements ViewUpdateNotifier {
private static final Logger LOG = Logger.getLogger(ViewUpdateNotifierImpl.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java Sun Jan 22 17:07:22 2012
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.dnd.view.border;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.viewer.dnd.drawing.Bounds;
import org.apache.isis.viewer.dnd.drawing.Canvas;
@@ -33,7 +35,6 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.Workspace;
import org.apache.isis.viewer.dnd.view.base.AbstractBorder;
import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
-import org.apache.log4j.Logger;
public abstract class ResizeBorder extends AbstractBorder {
private static final Logger LOG = Logger.getLogger(ResizeBorder.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java Sun Jan 22 17:07:22 2012
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.dnd.view.border;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Allow;
import org.apache.isis.core.metamodel.consent.Consent;
@@ -35,7 +37,6 @@ import org.apache.isis.viewer.dnd.view.W
import org.apache.isis.viewer.dnd.view.content.FieldContent;
import org.apache.isis.viewer.dnd.view.content.RootObject;
import org.apache.isis.viewer.dnd.view.control.AbstractButtonAction;
-import org.apache.log4j.Logger;
public class SaveTransientObjectBorder extends ButtonBorder {
private static final Logger LOG = Logger.getLogger(SaveTransientObjectBorder.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java Sun Jan 22 17:07:22 2012
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.dnd.view.
import java.util.Enumeration;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
@@ -33,7 +35,6 @@ import org.apache.isis.viewer.dnd.view.c
import org.apache.isis.viewer.dnd.view.collection.CollectionElement;
import org.apache.isis.viewer.dnd.view.field.OneToManyField;
import org.apache.isis.viewer.dnd.view.field.OneToManyFieldElementImpl;
-import org.apache.log4j.Logger;
public class CollectionElementBuilder extends AbstractViewBuilder {
private static final Logger LOG = Logger.getLogger(CollectionElementBuilder.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java Sun Jan 22 17:07:22 2012
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.dnd.view.
import java.util.Vector;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ToString;
@@ -38,7 +40,6 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.ViewAreaType;
import org.apache.isis.viewer.dnd.view.ViewSpecification;
import org.apache.isis.viewer.dnd.view.base.ObjectView;
-import org.apache.log4j.Logger;
public abstract class CompositeView extends ObjectView {
private static final Logger LOG = Logger.getLogger(CompositeView.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java Sun Jan 22 17:07:22 2012
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.dnd.view.
import java.util.List;
+import org.apache.log4j.Logger;
+
import org.apache.isis.applib.filter.Filter;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
@@ -39,7 +41,6 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.ViewFactory;
import org.apache.isis.viewer.dnd.view.base.FieldErrorView;
import org.apache.isis.viewer.dnd.view.content.FieldContent;
-import org.apache.log4j.Logger;
public class ObjectFieldBuilder extends AbstractViewBuilder {
private static final Logger LOG = Logger.getLogger(ObjectFieldBuilder.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java Sun Jan 22 17:07:22 2012
@@ -19,10 +19,11 @@
package org.apache.isis.viewer.dnd.view.control;
+import org.apache.log4j.Logger;
+
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.Workspace;
-import org.apache.log4j.Logger;
public class CancelAction extends AbstractButtonAction {
private static final Logger LOG = Logger.getLogger(CancelAction.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java Sun Jan 22 17:07:22 2012
@@ -23,6 +23,9 @@ import static org.apache.isis.core.commo
import java.util.Enumeration;
+import org.apache.log4j.Appender;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.metamodel.consent.Allow;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.Veto;
@@ -32,8 +35,6 @@ import org.apache.isis.viewer.dnd.drawin
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.Workspace;
import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
-import org.apache.log4j.Appender;
-import org.apache.log4j.Logger;
/**
* Display debug window
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugOption.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugOption.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugOption.java Sun Jan 22 17:07:22 2012
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.dnd.view.
import java.util.List;
+import com.google.common.collect.Lists;
+
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ActionType;
@@ -34,8 +36,6 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.Workspace;
import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
-import com.google.common.collect.Lists;
-
/**
* Display debug window
*/
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java Sun Jan 22 17:07:22 2012
@@ -19,6 +19,9 @@
package org.apache.isis.viewer.dnd.view.debug;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.ConsentAbstract;
import org.apache.isis.core.metamodel.spec.ActionType;
@@ -28,8 +31,6 @@ import org.apache.isis.viewer.dnd.view.U
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.Workspace;
import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
public class LoggingOptions implements MenuOptions {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java Sun Jan 22 17:07:22 2012
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.dnd.view.field;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
@@ -29,7 +31,6 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.viewer.dnd.view.UserActionSet;
import org.apache.isis.viewer.dnd.view.content.AbstractObjectContent;
-import org.apache.log4j.Logger;
public class OneToManyFieldElementImpl extends AbstractObjectContent implements OneToManyFieldElement {
private static final Logger LOG = Logger.getLogger(OneToManyFieldElementImpl.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java Sun Jan 22 17:07:22 2012
@@ -22,6 +22,8 @@ package org.apache.isis.viewer.dnd.view.
import java.awt.event.KeyEvent;
import java.util.Vector;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
@@ -54,7 +56,6 @@ import org.apache.isis.viewer.dnd.view.b
import org.apache.isis.viewer.dnd.view.content.AbstractContent;
import org.apache.isis.viewer.dnd.view.content.NullContent;
import org.apache.isis.viewer.dnd.view.window.SubviewFocusManager;
-import org.apache.log4j.Logger;
public class PopupMenu extends AbstractView {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/OpenViewOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/OpenViewOption.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/OpenViewOption.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/OpenViewOption.java Sun Jan 22 17:07:22 2012
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.dnd.view.option;
+import org.apache.log4j.Logger;
+
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.view.Content;
import org.apache.isis.viewer.dnd.view.Placement;
@@ -27,7 +29,6 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.ViewSpecification;
import org.apache.isis.viewer.dnd.view.Workspace;
import org.apache.isis.viewer.dnd.view.content.FieldContent;
-import org.apache.log4j.Logger;
public class OpenViewOption extends UserActionAbstract {
private static final Logger LOG = Logger.getLogger(OpenViewOption.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/ReplaceViewOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/ReplaceViewOption.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/ReplaceViewOption.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/option/ReplaceViewOption.java Sun Jan 22 17:07:22 2012
@@ -19,12 +19,13 @@
package org.apache.isis.viewer.dnd.view.option;
+import org.apache.log4j.Logger;
+
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.view.Axes;
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.ViewSpecification;
import org.apache.isis.viewer.dnd.view.Workspace;
-import org.apache.log4j.Logger;
public class ReplaceViewOption extends UserActionAbstract {
private static final Logger LOG = Logger.getLogger(ReplaceViewOption.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/text/TextContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/text/TextContent.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/text/TextContent.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/text/TextContent.java Sun Jan 22 17:07:22 2012
@@ -22,11 +22,12 @@ package org.apache.isis.viewer.dnd.view.
import java.util.Enumeration;
import java.util.Vector;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.viewer.dnd.drawing.Location;
-import org.apache.log4j.Logger;
public class TextContent {
private static final Logger LOG = Logger.getLogger(TextContent.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/SkylarkViewFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/SkylarkViewFactory.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/SkylarkViewFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/SkylarkViewFactory.java Sun Jan 22 17:07:22 2012
@@ -25,6 +25,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Vector;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -48,7 +50,6 @@ import org.apache.isis.viewer.dnd.view.b
import org.apache.isis.viewer.dnd.view.collection.CollectionContent;
import org.apache.isis.viewer.dnd.viewer.basic.FallbackView;
import org.apache.isis.viewer.dnd.viewer.basic.MinimizedView;
-import org.apache.log4j.Logger;
/**
* This class holds all the different view types that all the different objects
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspaceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspaceBuilder.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspaceBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspaceBuilder.java Sun Jan 22 17:07:22 2012
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.dnd.viewer.basic;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.userprofile.PerspectiveEntry;
@@ -31,7 +33,6 @@ import org.apache.isis.viewer.dnd.view.P
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.base.Layout;
import org.apache.isis.viewer.dnd.view.composite.AbstractViewBuilder;
-import org.apache.log4j.Logger;
/**
* WorkspaceBuilder builds a workspace view for an ObjectContent view by finding
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/LogoBackground.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/LogoBackground.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/LogoBackground.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/LogoBackground.java Sun Jan 22 17:07:22 2012
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.dnd.viewer.basic;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.viewer.dnd.drawing.Background;
@@ -28,7 +30,6 @@ import org.apache.isis.viewer.dnd.drawin
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.drawing.Size;
import org.apache.isis.viewer.dnd.util.Properties;
-import org.apache.log4j.Logger;
public class LogoBackground implements Background {
private static final Logger LOG = Logger.getLogger(LogoBackground.class);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/ConfigurableListViewSpecificationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/ConfigurableListViewSpecificationTest.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/ConfigurableListViewSpecificationTest.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/ConfigurableListViewSpecificationTest.java Sun Jan 22 17:07:22 2012
@@ -23,10 +23,6 @@ import static org.junit.Assert.assertTru
import java.util.Enumeration;
-import org.apache.isis.viewer.dnd.TestToolkit;
-import org.apache.isis.viewer.dnd.view.Content;
-import org.apache.isis.viewer.dnd.view.ViewRequirement;
-import org.apache.isis.viewer.dnd.view.collection.CollectionContent;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.jmock.Expectations;
@@ -34,6 +30,11 @@ import org.jmock.Mockery;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.viewer.dnd.TestToolkit;
+import org.apache.isis.viewer.dnd.view.Content;
+import org.apache.isis.viewer.dnd.view.ViewRequirement;
+import org.apache.isis.viewer.dnd.view.collection.CollectionContent;
+
public class ConfigurableListViewSpecificationTest {
private GridListSpecification viewSpecification;
private CollectionContent collectionContent;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelTest.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelTest.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelTest.java Sun Jan 22 17:07:22 2012
@@ -22,15 +22,16 @@ package org.apache.isis.viewer.dnd.confi
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNull;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.viewer.dnd.DummyView;
import org.apache.isis.viewer.dnd.TestToolkit;
import org.apache.isis.viewer.dnd.configurable.PanelView.Position;
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.drawing.Size;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.junit.Test;
public class PanelTest {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java Sun Jan 22 17:07:22 2012
@@ -21,6 +21,13 @@ package org.apache.isis.viewer.dnd.confi
import static org.junit.Assert.assertEquals;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.testsystem.TestProxyConfiguration;
import org.apache.isis.viewer.dnd.DummyContent;
@@ -33,12 +40,6 @@ import org.apache.isis.viewer.dnd.drawin
import org.apache.isis.viewer.dnd.view.Content;
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.ViewDrag;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.junit.Before;
-import org.junit.Test;
public class PanelViewDropTest {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewTest.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewTest.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewTest.java Sun Jan 22 17:07:22 2012
@@ -21,6 +21,11 @@ package org.apache.isis.viewer.dnd.confi
import static org.junit.Assert.assertEquals;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.testsystem.TestProxyConfiguration;
import org.apache.isis.viewer.dnd.DummyContent;
@@ -29,10 +34,6 @@ import org.apache.isis.viewer.dnd.TestTo
import org.apache.isis.viewer.dnd.configurable.PanelView.Position;
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.drawing.Size;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.junit.Test;
public class PanelViewTest {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/toolbar/ToolbarTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/toolbar/ToolbarTest.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/toolbar/ToolbarTest.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/toolbar/ToolbarTest.java Sun Jan 22 17:07:22 2012
@@ -21,6 +21,12 @@ package org.apache.isis.viewer.dnd.toolb
import static org.junit.Assert.assertEquals;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
import org.apache.isis.runtimes.dflt.objectstores.dflt.testsystem.TestProxySystemII;
import org.apache.isis.viewer.dnd.DummyView;
import org.apache.isis.viewer.dnd.TestToolkit;
@@ -29,11 +35,6 @@ import org.apache.isis.viewer.dnd.drawin
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.content.NullContent;
import org.apache.isis.viewer.dnd.view.look.LookFactory;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
public class ToolbarTest {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/util/PropertiesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/util/PropertiesTest.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/util/PropertiesTest.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/util/PropertiesTest.java Sun Jan 22 17:07:22 2012
@@ -21,13 +21,14 @@ package org.apache.isis.viewer.dnd.util;
import static org.junit.Assert.assertEquals;
-import org.apache.isis.core.runtime.userprofile.Options;
-import org.apache.isis.runtimes.dflt.objectstores.dflt.testsystem.TestProxySystemII;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Ignore;
import org.junit.Test;
+import org.apache.isis.core.runtime.userprofile.Options;
+import org.apache.isis.runtimes.dflt.objectstores.dflt.testsystem.TestProxySystemII;
+
public class PropertiesTest {
@Ignore("having problems with test classpath - TestProxySystemII can't find JavaReflectorInstaller, for some reason")
Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewTest.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewTest.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewTest.java Sun Jan 22 17:07:22 2012
@@ -23,15 +23,16 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.apache.isis.viewer.dnd.DummyView;
-import org.apache.isis.viewer.dnd.TestToolkit;
-import org.apache.isis.viewer.dnd.drawing.Size;
-import org.apache.isis.viewer.dnd.view.content.NullContent;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.viewer.dnd.DummyView;
+import org.apache.isis.viewer.dnd.TestToolkit;
+import org.apache.isis.viewer.dnd.drawing.Size;
+import org.apache.isis.viewer.dnd.view.content.NullContent;
+
public class CompositeViewTest {
private CompositeView view;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java Sun Jan 22 17:07:22 2012
@@ -22,16 +22,6 @@ package org.apache.isis.viewer.dnd.view.
import java.util.Collections;
import java.util.List;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-import org.apache.isis.core.runtime.authentication.AuthenticationManager;
-import org.apache.isis.core.runtime.authorization.AuthorizationManager;
-import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
-import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
-import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
-import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContextStatic;
-import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactoryDefault;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.jmock.Expectations;
@@ -43,6 +33,17 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authorization.AuthorizationManager;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
+import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContextStatic;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactoryDefault;
+
@RunWith(JMock.class)
public class MultilineTextFieldContentTest {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java Sun Jan 22 17:07:22 2012
@@ -24,6 +24,17 @@ import static org.junit.Assert.assertEqu
import java.util.Collections;
import java.util.List;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
@@ -37,16 +48,6 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactory;
import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactoryDefault;
import org.apache.isis.viewer.dnd.drawing.Location;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
@RunWith(JMock.class)
public class TextFieldContentTest {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java Sun Jan 22 17:07:22 2012
@@ -29,6 +29,17 @@ import java.util.Vector;
import junit.framework.Assert;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.debug.DebugString;
@@ -58,16 +69,6 @@ import org.apache.isis.viewer.dnd.DummyW
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.base.ViewUpdateNotifierImpl;
import org.apache.isis.viewer.dnd.view.content.RootObject;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
@RunWith(JMock.class)
public class ViewUpdateNotifierTest {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java Sun Jan 22 17:07:22 2012
@@ -22,6 +22,18 @@ package org.apache.isis.viewer.dnd.viewe
import java.util.Collections;
import java.util.List;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.easymock.MockControl;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
@@ -43,17 +55,6 @@ import org.apache.isis.viewer.dnd.view.A
import org.apache.isis.viewer.dnd.view.Content;
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.ViewFactory;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.easymock.MockControl;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
@RunWith(JMock.class)
public class ActionFieldBuilderTest {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/PlacementStrategyImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/PlacementStrategyImplTest.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/PlacementStrategyImplTest.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/PlacementStrategyImplTest.java Sun Jan 22 17:07:22 2012
@@ -19,6 +19,10 @@
package org.apache.isis.viewer.dnd.viewer.basic;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.testsystem.TestProxyConfiguration;
import org.apache.isis.viewer.dnd.DummyView;
@@ -26,9 +30,6 @@ import org.apache.isis.viewer.dnd.DummyW
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.drawing.Size;
import org.apache.isis.viewer.dnd.view.PlacementStrategyImpl;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
public class PlacementStrategyImplTest {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java?rev=1234550&r1=1234549&r2=1234550&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java Sun Jan 22 17:07:22 2012
@@ -22,6 +22,17 @@ package org.apache.isis.viewer.dnd.viewe
import java.util.Collections;
import java.util.List;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
@@ -40,16 +51,6 @@ import org.apache.isis.viewer.dnd.drawin
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.ViewAreaType;
import org.apache.isis.viewer.dnd.view.border.ScrollBorder;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
@RunWith(JMock.class)
public class ScrollBorderTest {