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 2011/05/03 09:18:38 UTC
svn commit: r1098945 [8/25] - in /incubator/isis/trunk/viewer:
bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/
bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/
bdd/common/src/main/java/org/apache/isis/viewer/bdd/common...
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.awt;
import java.awt.BorderLayout;
@@ -39,13 +38,11 @@ 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;
@@ -63,30 +60,31 @@ public class LoginDialog extends Frame i
private AuthenticationSession session;
private Label instructionLabel;
- public LoginDialog(AuthenticationManager authenticationManager) {
+ public LoginDialog(final AuthenticationManager authenticationManager) {
super("Apache Isis Login");
this.authenticationManager = authenticationManager;
setBackground(new Color(0xe0e0e0));
-
+
AWTUtilities.addWindowIcon(this, "login-logo.png");
addWindowListener(new WindowAdapter() {
- public void windowClosing(WindowEvent e) {
+ @Override
+ public void windowClosing(final WindowEvent e) {
cancel(e.getComponent());
}
});
-
- setLayout(new BorderLayout(0, 10));
- createInstructionLabel();
- createLoginFields();
- createButtonsPanel();
+ setLayout(new BorderLayout(0, 10));
+
+ createInstructionLabel();
+ createLoginFields();
+ createButtonsPanel();
- setResizable(false);
+ setResizable(false);
pack();
final int height = getSize().height;
- final int width = getFontMetrics(getFont()).charWidth('x') * 48;
+ final int width = getFontMetrics(getFont()).charWidth('x') * 48;
setSize(width, height);
final Dimension screen = getToolkit().getScreenSize();
@@ -103,18 +101,19 @@ public class LoginDialog extends Frame i
private void createInstructionLabel() {
instructionLabel = new Label("Please enter your user name and password.");
- add(instructionLabel, BorderLayout.NORTH);
+ add(instructionLabel, BorderLayout.NORTH);
}
- private void createLoginFields() {
- Panel form = new Panel(new GridLayout(2, 2, 6, 8)) {
- private static final long serialVersionUID = 1L;
+ private void createLoginFields() {
+ final Panel form = new Panel(new GridLayout(2, 2, 6, 8)) {
+ private static final long serialVersionUID = 1L;
+ @Override
public Insets getInsets() {
- return new Insets(12, 0, 6, 80);
- }
- };
- add(form, BorderLayout.CENTER);
+ return new Insets(12, 0, 6, 80);
+ }
+ };
+ add(form, BorderLayout.CENTER);
form.add(new Label("User name:", Label.RIGHT));
form.add(user = new TextField());
@@ -124,12 +123,12 @@ public class LoginDialog extends Frame i
form.add(password = new TextField());
password.addKeyListener(this);
password.setEchoChar('*');
- }
-
- private void createButtonsPanel() {
- Panel buttons = new Panel(new FlowLayout(FlowLayout.RIGHT));
+ }
+
+ private void createButtonsPanel() {
+ final Panel buttons = new Panel(new FlowLayout(FlowLayout.RIGHT));
add(buttons, BorderLayout.SOUTH);
-
+
buttons.add(cancel = new Button(CANCEL_LABEL));
cancel.addActionListener(this);
cancel.addKeyListener(this);
@@ -137,7 +136,7 @@ public class LoginDialog extends Frame i
buttons.add(login = new Button(LOGIN_LABEL));
login.addActionListener(this);
login.addKeyListener(this);
- }
+ }
@Override
public Insets getInsets() {
@@ -149,14 +148,17 @@ public class LoginDialog extends Frame i
return in;
}
+ @Override
public void actionPerformed(final ActionEvent evt) {
action(evt.getSource());
}
+ @Override
public void keyPressed(final KeyEvent e) {
- // ignore
+ // ignore
}
+ @Override
public void keyReleased(final KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_ENTER) {
action(e.getComponent());
@@ -166,8 +168,9 @@ public class LoginDialog extends Frame i
}
}
+ @Override
public void keyTyped(final KeyEvent e) {
- // ignore
+ // ignore
}
private synchronized void cancel(final Object widget) {
@@ -182,13 +185,15 @@ public class LoginDialog extends Frame i
setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
instructionLabel.setText("Authorising...");
instructionLabel.setForeground(Color.BLACK);
-
- AuthenticationRequestPassword authenticationRequest = new AuthenticationRequestPassword(getUser(), getPassword());
+
+ final AuthenticationRequestPassword authenticationRequest =
+ new AuthenticationRequestPassword(getUser(), getPassword());
session = authenticationManager.authenticate(authenticationRequest);
if (session == null) {
try {
Thread.sleep(750);
- } catch (InterruptedException ignore) {}
+ } catch (final InterruptedException ignore) {
+ }
instructionLabel.setText("Invalid user name or password; please try again.");
instructionLabel.setForeground(Color.RED);
} else {
@@ -212,15 +217,15 @@ public class LoginDialog extends Frame i
private String getUser() {
return StringUtils.removeTabs(user.getText()).trim();
}
-
- public void setUserName(String name) {
+
+ public void setUserName(final String name) {
user.setText(name);
}
private String getPassword() {
return StringUtils.removeTabs(password.getText()).trim();
}
-
+
public AuthenticationSession getSession() {
return session;
}
@@ -228,7 +233,8 @@ public class LoginDialog extends Frame i
public synchronized boolean login() {
try {
wait();
- } catch (final InterruptedException e) {}
+ } catch (final InterruptedException e) {
+ }
return logIn;
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/OverlayDebugFrame.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/OverlayDebugFrame.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/OverlayDebugFrame.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/OverlayDebugFrame.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.awt;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
@@ -26,7 +25,6 @@ import org.apache.isis.viewer.dnd.view.b
import org.apache.isis.viewer.dnd.view.content.NullContent;
import org.apache.isis.viewer.dnd.view.debug.DebugView;
-
public class OverlayDebugFrame extends DebugFrame {
private static final long serialVersionUID = 1L;
private final XViewer viewer;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/PrintOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/PrintOption.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/PrintOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/PrintOption.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.awt;
import java.awt.Dimension;
@@ -33,7 +32,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;
-
public class PrintOption extends UserActionAbstract {
private final int HEIGHT = 60;
private final int LEFT = 60;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/RenderingArea.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/RenderingArea.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/RenderingArea.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/RenderingArea.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.awt;
import java.awt.Cursor;
@@ -28,7 +27,6 @@ import java.awt.event.KeyListener;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
-
public interface RenderingArea {
Dimension getSize();
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.awt;
import java.awt.Button;
@@ -37,7 +36,6 @@ import java.awt.event.WindowEvent;
import org.apache.log4j.Logger;
-
class ShutdownDialog extends Dialog implements ActionListener, KeyListener {
private static final long serialVersionUID = 1L;
private static final Logger LOG = Logger.getLogger(ShutdownDialog.class);
@@ -99,14 +97,17 @@ class ShutdownDialog extends Dialog impl
return in;
}
+ @Override
public void actionPerformed(final ActionEvent evt) {
action(evt.getSource());
}
+ @Override
public void keyPressed(final KeyEvent e) {
- // ignore
+ // ignore
}
+ @Override
public void keyReleased(final KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_ENTER) {
action(e.getComponent());
@@ -116,8 +117,9 @@ class ShutdownDialog extends Dialog impl
}
}
+ @Override
public void keyTyped(final KeyEvent e) {
- // ignore
+ // ignore
}
private synchronized void cancel(final Object widget) {
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/SpyWindow.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/SpyWindow.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/SpyWindow.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/SpyWindow.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.awt;
import java.awt.Frame;
@@ -27,7 +26,6 @@ import java.awt.event.WindowEvent;
import org.apache.isis.viewer.dnd.view.InteractionSpyWindow;
-
class SpyWindow implements InteractionSpyWindow {
private int event;
private String label[][] = new String[2][20];
@@ -73,6 +71,7 @@ class SpyWindow implements InteractionSp
}
}
+ @Override
public void display(final int event, final String label[][], final String[] trace, final int traceIndex) {
if (frame != null) {
this.event = event;
@@ -83,15 +82,16 @@ class SpyWindow implements InteractionSp
}
}
+ @Override
public void open() {
frame = new SpyFrame();
frame.setBounds(10, 10, 800, 500);
frame.setVisible(true);
}
+ @Override
public void close() {
frame.setVisible(false);
frame.dispose();
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.awt;
import java.awt.FileDialog;
@@ -35,13 +34,13 @@ import org.apache.isis.core.runtime.abou
import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
import org.apache.isis.viewer.dnd.view.Toolkit;
-
public class ViewerFrame extends Frame implements RenderingArea {
private static final String DEFAULT_TITLE = "Apache Isis";
private static final long serialVersionUID = 1L;
private XViewer viewer;
- public ViewerFrame() {}
+ public ViewerFrame() {
+ }
{
setBackground(((AwtColor) Toolkit.getColor(ColorsAndFonts.COLOR_APPLICATION)).getAwtColor());
@@ -60,8 +59,7 @@ public class ViewerFrame extends Frame i
e1.printStackTrace();
} catch (final NoSuchMethodException ignore) {
/*
- * Ignore no such method exception as this method is only available, but needed, in version 1.4
- * and later.
+ * Ignore no such method exception as this method is only available, but needed, in version 1.4 and later.
*/
} catch (final IllegalArgumentException e) {
e.printStackTrace();
@@ -72,11 +70,12 @@ public class ViewerFrame extends Frame i
}
}
- public boolean imageUpdate( Image img, int flags, int x, int y, int w, int h ) {
- repaint();
- return true;
+ @Override
+ public boolean imageUpdate(final Image img, final int flags, final int x, final int y, final int w, final int h) {
+ repaint();
+ return true;
}
-
+
/**
* Calls <code>update()</code> to do double-buffered drawing of all views.
*
@@ -119,8 +118,9 @@ public class ViewerFrame extends Frame i
public void componentResized(final ComponentEvent e) {
ViewerFrame.this.viewer.sizeChange();
}
-
- public void componentMoved(ComponentEvent e) {
+
+ @Override
+ public void componentMoved(final ComponentEvent e) {
ViewerFrame.this.viewer.locationChange(getLocation().x, getLocation().y);
}
});
@@ -133,6 +133,7 @@ public class ViewerFrame extends Frame i
super.setTitle(str);
}
+ @Override
public String selectFilePath(final String title, final String directory) {
final FileDialog dlg = new FileDialog(this, title);
dlg.setVisible(true);
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.awt;
import java.awt.Cursor;
@@ -35,7 +34,6 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.message.ExceptionMessageContent;
import org.apache.isis.viewer.dnd.view.message.TextMessageContent;
-
public class XFeedbackManager implements Feedback {
private final XViewer viewer;
private final Vector busy = new Vector();
@@ -50,6 +48,7 @@ public class XFeedbackManager implements
this.viewer = viewer;
}
+ @Override
public String getStatusBarOutput() {
final StringBuffer text = new StringBuffer();
append(text, view);
@@ -75,8 +74,9 @@ public class XFeedbackManager implements
// REVIEW why can only objects be set to busy? Specifically the service icon do not show as bust when a
// long standing option is being set up when a menu is being created.
+ @Override
public void setBusy(final View view, final BackgroundTask task) {
- Content content = view.getContent();
+ final Content content = view.getContent();
if (content != null && content.isObject()) {
final ObjectAdapter object = ((ObjectContent) content).getObject();
busy.addElement(object);
@@ -87,6 +87,7 @@ public class XFeedbackManager implements
// Don't force repaint here, else an infinite loop forms as the layout
}
+ @Override
public void clearBusy(final View view) {
if (view.getContent().isObject()) {
final ObjectAdapter object = ((ObjectContent) view.getContent()).getObject();
@@ -101,6 +102,7 @@ public class XFeedbackManager implements
}
}
+ @Override
public boolean isBusy(final View view) {
if (view != null) {
final Content content = view.getContent();
@@ -116,6 +118,7 @@ public class XFeedbackManager implements
return false;
}
+ @Override
public void showBusyState(final View view) {
Cursor cursor;
if (isBusy(view)) {
@@ -126,44 +129,50 @@ public class XFeedbackManager implements
viewer.setCursor(cursor);
}
+ @Override
public void setViewDetail(final String text) {
view = text;
viewer.forcePaintOfStatusBar();
}
+ @Override
public void addMessage(final String text) {
message = text;
viewer.forcePaintOfStatusBar();
}
+ @Override
public void clearAction() {
action = null;
viewer.forcePaintOfStatusBar();
}
+ @Override
public void setAction(final String text) {
action = text;
viewer.forcePaintOfStatusBar();
}
+ @Override
public void setError(final String text) {
error = text;
viewer.forcePaintOfStatusBar();
}
+ @Override
public void clearError() {
error = null;
viewer.forcePaintOfStatusBar();
}
+ @Override
public void showMessagesAndWarnings() {
this.messages = getMessageBroker().getMessagesCombined();
// TODO this is common across viewers so should be in common code.
final List<String> warnings = getMessageBroker().getWarnings();
- for (String warning: warnings) {
- final TextMessageContent content =
- new TextMessageContent("Warning", warning);
+ for (final String warning : warnings) {
+ final TextMessageContent content = new TextMessageContent("Warning", warning);
viewer.showDialog(content);
}
}
@@ -172,63 +181,78 @@ public class XFeedbackManager implements
return IsisContext.getMessageBroker();
}
+ @Override
public void showException(final Throwable e) {
final ExceptionMessageContent content = new ExceptionMessageContent(e);
viewer.showDialog(content);
}
+ @Override
public void showArrowCursor() {
setCursor(Cursor.DEFAULT_CURSOR);
}
+ @Override
public void showCrosshairCursor() {
setCursor(Cursor.CROSSHAIR_CURSOR);
}
+ @Override
public void showDefaultCursor() {
setCursor(Cursor.DEFAULT_CURSOR);
}
+ @Override
public void showHandCursor() {
setCursor(Cursor.HAND_CURSOR);
}
+ @Override
public void showMoveCursor() {
setCursor(Cursor.MOVE_CURSOR);
}
+ @Override
public void showResizeDownCursor() {
setCursor(Cursor.S_RESIZE_CURSOR);
}
+ @Override
public void showResizeDownLeftCursor() {
setCursor(Cursor.SW_RESIZE_CURSOR);
}
+ @Override
public void showResizeDownRightCursor() {
setCursor(Cursor.SE_RESIZE_CURSOR);
}
+ @Override
public void showResizeLeftCursor() {
setCursor(Cursor.W_RESIZE_CURSOR);
}
+ @Override
public void showResizeRightCursor() {
setCursor(Cursor.E_RESIZE_CURSOR);
}
+ @Override
public void showResizeUpCursor() {
setCursor(Cursor.N_RESIZE_CURSOR);
}
+ @Override
public void showResizeUpLeftCursor() {
setCursor(Cursor.NW_RESIZE_CURSOR);
}
+ @Override
public void showResizeUpRightCursor() {
setCursor(Cursor.NE_RESIZE_CURSOR);
}
+ @Override
public void showTextCursor() {
setCursor(Cursor.TEXT_CURSOR);
}
@@ -238,4 +262,3 @@ public class XFeedbackManager implements
viewer.setCursor(cursor);
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.awt;
import java.awt.Cursor;
@@ -34,7 +33,6 @@ 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;
@@ -73,7 +71,7 @@ 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);
@@ -123,7 +121,8 @@ public class XViewer implements Viewer {
public XViewer() {
doubleBuffering = IsisContext.getConfiguration().getBoolean(Properties.PROPERTY_BASE + "double-buffer", true);
- showExplorationMenuByDefault = IsisContext.getConfiguration().getBoolean(Properties.PROPERTY_BASE + "exploration.show", true);
+ showExplorationMenuByDefault =
+ IsisContext.getConfiguration().getBoolean(Properties.PROPERTY_BASE + "exploration.show", true);
overlayView = CLEAR_OVERLAY;
redrawArea = new Bounds();
}
@@ -134,14 +133,17 @@ public class XViewer implements Viewer {
}
}
+ @Override
public void addToNotificationList(final View view) {
updateNotifier.add(view.getView());
}
+ @Override
public String selectFilePath(final String title, final String directory) {
return renderingArea.selectFilePath(title, directory);
}
+ @Override
public void setKeyboardFocus(final View view) {
if (view == null) {
return;
@@ -149,7 +151,7 @@ public class XViewer implements Viewer {
final FocusManager currentFocusManager = keyboardManager.getFocusManager();
if (currentFocusManager != null && currentFocusManager.getFocus() != null
- && currentFocusManager.getFocus().getParent() != null) {
+ && currentFocusManager.getFocus().getParent() != null) {
currentFocusManager.getFocus().getParent().markDamaged();
}
@@ -174,11 +176,13 @@ public class XViewer implements Viewer {
}
}
+ @Override
public void clearOverlayView() {
overlayView.markDamaged();
overlayView = CLEAR_OVERLAY;
}
+ @Override
public void clearOverlayView(final View view) {
if (this.getOverlayView() != view) {
LOG.warn("no such view to remove: " + view);
@@ -205,6 +209,7 @@ public class XViewer implements Viewer {
clearOverlayView();
}
+ @Override
public void disposeUnneededViews() {
updateNotifier.removeViewsForDisposedObjects();
}
@@ -260,14 +265,17 @@ public class XViewer implements Viewer {
return overlayView;
}
+ @Override
public InteractionSpy getSpy() {
return spy;
}
+ @Override
public UndoStack getUndoStack() {
return undoStack;
}
+ @Override
public boolean hasFocus(final View view) {
final FocusManager focusManager = keyboardManager.getFocusManager();
return focusManager != null && focusManager.getFocus() == view;
@@ -295,7 +303,8 @@ public class XViewer implements Viewer {
spy = new InteractionSpy(new SpyWindow());
keyboardManager = new KeyboardManager(this);
- final InteractionHandler interactionHandler = new InteractionHandler(this, feedbackManager, keyboardManager, spy);
+ final InteractionHandler interactionHandler =
+ new InteractionHandler(this, feedbackManager, keyboardManager, spy);
renderingArea.addMouseMotionListener(interactionHandler);
renderingArea.addMouseListener(interactionHandler);
renderingArea.addKeyListener(interactionHandler);
@@ -309,10 +318,12 @@ public class XViewer implements Viewer {
APPLICATION_OPTIONS = new ApplicationOptions(listener);
}
+ @Override
public boolean isRunningAsExploration() {
return runningAsExploration;
}
+ @Override
public boolean isRunningAsPrototype() {
return runningAsPrototype;
}
@@ -321,11 +332,12 @@ public class XViewer implements Viewer {
return spy.isVisible();
}
+ @Override
public void markDamaged(final Bounds bounds) {
if (spy != null) {
spy.addDamagedArea(bounds);
}
-
+
synchronized (redrawArea) {
if (redrawArea.equals(NO_REDRAW)) {
redrawArea.setBounds(bounds);
@@ -339,7 +351,8 @@ public class XViewer implements Viewer {
}
}
- public void menuOptions(final UserActionSet options) {}
+ public void menuOptions(final UserActionSet options) {
+ }
public void mouseDown(final Click click) {
if (onOverlay(click.getLocation())) {
@@ -385,8 +398,8 @@ public class XViewer implements Viewer {
spy.redraw(paintArea.toString(), redrawCount);
}
if (UI_LOG.isDebugEnabled()) {
- UI_LOG.debug("------ repaint viewer #" + redrawCount + " " + paintArea.x + "," + paintArea.y + " " + paintArea.width
- + "x" + paintArea.height);
+ UI_LOG.debug("------ repaint viewer #" + redrawCount + " " + paintArea.x + "," + paintArea.y + " "
+ + paintArea.width + "x" + paintArea.height);
}
final Canvas c = createCanvas(graphic, paintArea);
@@ -400,7 +413,7 @@ public class XViewer implements Viewer {
}
// paint overlay
- Bounds bounds = overlayView.getBounds();
+ final Bounds bounds = overlayView.getBounds();
if (paintArea.intersects(new Rectangle(bounds.getX(), bounds.getY(), bounds.getWidth(), bounds.getHeight()))) {
overlayView.draw(c.createSubcanvas(bounds));
}
@@ -429,7 +442,7 @@ public class XViewer implements Viewer {
final int h = internalDisplaySize.getHeight();
if (doubleBuffering) {
if ((doubleBuffer == null) || (bufferGraphics == null) || (doubleBuffer.getWidth(null) < w)
- || (doubleBuffer.getHeight(null) < h)) {
+ || (doubleBuffer.getHeight(null) < h)) {
doubleBuffer = renderingArea.createImage(w, h);
LOG.debug("buffer sized to " + doubleBuffer.getWidth(null) + "x" + doubleBuffer.getHeight(null));
}
@@ -442,7 +455,8 @@ public class XViewer implements Viewer {
bufferGraphics.clearRect(0, 0, w, h);
bufferGraphics.setClip(paintArea.x, paintArea.y, paintArea.width, paintArea.height);
- final Canvas c = new AwtCanvas(bufferGraphics, renderingArea, paintArea.x, paintArea.y, paintArea.width, paintArea.height);
+ final Canvas c =
+ new AwtCanvas(bufferGraphics, renderingArea, paintArea.x, paintArea.y, paintArea.width, paintArea.height);
// Canvas c = new Canvas(bufferGraphics, 0, 0, w, h);
return c;
}
@@ -463,8 +477,8 @@ public class XViewer implements Viewer {
rootView.layout();
synchronized (redrawArea) {
if (!redrawArea.equals(NO_REDRAW)) {
- final Rectangle r2 = new Rectangle(redrawArea.getX(), redrawArea.getY(), redrawArea.getWidth(), redrawArea
- .getHeight());
+ final Rectangle r2 =
+ new Rectangle(redrawArea.getX(), redrawArea.getY(), redrawArea.getWidth(), redrawArea.getHeight());
redrawArea.setBounds(NO_REDRAW);
return r2;
}
@@ -512,12 +526,8 @@ public class XViewer implements Viewer {
}
}
- public void popupMenu(
- final View over,
- final Location at,
- final boolean forView,
- final boolean includeExploration,
- final boolean includeDebug) {
+ public void popupMenu(final View over, final Location at, final boolean forView, final boolean includeExploration,
+ final boolean includeDebug) {
feedbackManager.setBusy(over, null);
saveCurrentFieldEntry();
final PopupMenuContainer menu = new PopupMenuContainer(over, at);
@@ -532,6 +542,7 @@ public class XViewer implements Viewer {
feedbackManager.clearBusy(over);
}
+ @Override
public void removeFromNotificationList(final View view) {
updateNotifier.remove(view);
}
@@ -539,6 +550,7 @@ public class XViewer implements Viewer {
/**
* Force a repaint of the damaged area of the viewer.
*/
+ @Override
public void scheduleRepaint() {
updateNotifier.invalidateViewsForChangedObjects();
synchronized (redrawArea) {
@@ -552,6 +564,7 @@ public class XViewer implements Viewer {
}
}
+ @Override
public void saveCurrentFieldEntry() {
final FocusManager focusManager = getFocusManager();
if (focusManager != null) {
@@ -573,6 +586,7 @@ public class XViewer implements Viewer {
}
}
+ @Override
public void setBackground(final Background background) {
this.background = background;
}
@@ -593,6 +607,7 @@ public class XViewer implements Viewer {
this.listener = listener;
}
+ @Override
public void setOverlayView(final View view) {
disposeOverlayView();
overlayView = view;
@@ -608,15 +623,18 @@ public class XViewer implements Viewer {
overlayView.markDamaged();
}
+ @Override
public Size getOverlaySize() {
return rootView.getSize();
}
- public void showInOverlay(Content content, Location location) {
+ @Override
+ public void showInOverlay(final Content content, final Location location) {
View view;
view = Toolkit.getViewFactory().createView(new ViewRequirement(content, ViewRequirement.OPEN));
- view = new LineBorder(2, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2), new BackgroundBorder(Toolkit
- .getColor(ColorsAndFonts.COLOR_SECONDARY3), view));
+ view =
+ new LineBorder(2, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2), new BackgroundBorder(
+ Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3), view));
final Size size = view.getRequiredSize(Size.createMax());
location.subtract(size.getWidth() / 2, size.getHeight() / 2);
view.setLocation(location);
@@ -655,22 +673,21 @@ public class XViewer implements Viewer {
public void sizeChange() {
initSize();
final View subviews[] = rootView.getSubviews();
- for (int i = 0; i < subviews.length; i++) {
- subviews[i].invalidateLayout();
+ for (final View subview : subviews) {
+ subview.invalidateLayout();
}
final Bounds bounds = new Bounds(internalDisplaySize);
markDamaged(bounds);
scheduleRepaint();
-
+
Properties.saveSizeOption(Properties.PROPERTY_BASE + "initial.size", bounds.getSize());
}
- public void locationChange(int x, int y) {
+ public void locationChange(final int x, final int y) {
Properties.saveLocationOption(Properties.PROPERTY_BASE + "initial.location", new Location(x, y));
}
-
-
+
public void initSize() {
internalDisplaySize = createSize(renderingArea.getSize());
insets = renderingArea.getInsets();
@@ -679,10 +696,11 @@ public class XViewer implements Viewer {
LOG.debug(" internal " + internalDisplaySize);
final Size rootViewSize = new Size(internalDisplaySize);
- Text text = Toolkit.getText(ColorsAndFonts.TEXT_STATUS);
+ final Text text = Toolkit.getText(ColorsAndFonts.TEXT_STATUS);
statusBarHeight = text.getLineHeight() + text.getDescent();
rootViewSize.contractHeight(statusBarHeight);
- statusBarArea = new Bounds(insets.left, insets.top + rootViewSize.getHeight(), rootViewSize.getWidth(), statusBarHeight);
+ statusBarArea =
+ new Bounds(insets.left, insets.top + rootViewSize.getHeight(), rootViewSize.getWidth(), statusBarHeight);
rootView.setSize(rootViewSize);
}
@@ -722,7 +740,7 @@ public class XViewer implements Viewer {
}
public void makeRootFocus() {
- // makeFocus(rootView);
+ // makeFocus(rootView);
}
public void openHelp(final View forView) {
@@ -745,6 +763,7 @@ public class XViewer implements Viewer {
}
+ @Override
public Object getClipboard(final Class<?> cls) {
if (cls == String.class) {
@@ -763,6 +782,7 @@ public class XViewer implements Viewer {
}
}
+ @Override
public void setClipboard(final String clip, final Class<?> class1) {
final Clipboard cb = java.awt.Toolkit.getDefaultToolkit().getSystemClipboard();
cb.setContents(new StringSelection(clip), null);
@@ -775,19 +795,21 @@ public class XViewer implements Viewer {
}
public void showDialog(final MessageContent content) {
- ViewRequirement requirement = new ViewRequirement(content, ViewRequirement.OPEN);
+ final ViewRequirement requirement = new ViewRequirement(content, ViewRequirement.OPEN);
final View view = Toolkit.getViewFactory().createView(requirement);
rootView.getWorkspace().addDialog(view, new Placement(Placement.CENTER));
scheduleRepaint();
}
-
- public void showDebugFrame(DebuggableWithTitle[] info, Location at) {
+
+ @Override
+ public void showDebugFrame(final DebuggableWithTitle[] info, final Location at) {
final InfoDebugFrame f = new InfoDebugFrame();
f.setInfo(info);
f.show(at.getX(), at.getY());
}
+ @Override
public void clearAction() {
feedbackManager.clearAction();
clearOverlayView();
@@ -802,10 +824,11 @@ public class XViewer implements Viewer {
renderingArea.dispose();
}
+ @Override
public void saveOpenObjects() {
- List<ObjectAdapter> objects = new ArrayList<ObjectAdapter>();
- for (View view : rootView.getSubviews()) {
- Content content = view.getContent();
+ final List<ObjectAdapter> objects = new ArrayList<ObjectAdapter>();
+ for (final View view : rootView.getSubviews()) {
+ final Content content = view.getContent();
if (content instanceof ObjectContent) {
objects.add(((ObjectContent) content).getAdapter());
}
@@ -814,4 +837,3 @@ public class XViewer implements Viewer {
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarCellContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarCellContent.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarCellContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarCellContent.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.calendar;
import java.util.ArrayList;
@@ -32,7 +31,6 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.viewer.dnd.view.Content;
import org.apache.isis.viewer.dnd.view.collection.AbstractCollectionContent;
-
public class CalendarCellContent extends AbstractCollectionContent {
private final String title;
private final List<Object> collection = new ArrayList<Object>();
@@ -41,49 +39,58 @@ public class CalendarCellContent extends
this.title = title;
}
+ @Override
public ObjectAdapter getCollection() {
return IsisContext.getPersistenceSession().getAdapterManager().adapterFor(collection);
}
- public Consent canDrop(Content sourceContent) {
+ @Override
+ public Consent canDrop(final Content sourceContent) {
return Veto.DEFAULT;
}
- public ObjectAdapter drop(Content sourceContent) {
+ @Override
+ public ObjectAdapter drop(final Content sourceContent) {
throw new UnexpectedCallException();
}
+ @Override
public String getHelp() {
return "No help available";
}
+ @Override
public String getIconName() {
return null;
}
+ @Override
public String getId() {
return null;
}
+ @Override
public ObjectAdapter getAdapter() {
return getCollection();
}
+ @Override
public ObjectSpecification getSpecification() {
throw new UnexpectedCallException();
}
+ @Override
public boolean isTransient() {
return true;
}
+ @Override
public String title() {
return title;
}
- public void addElement(ObjectAdapter element) {
+ public void addElement(final ObjectAdapter element) {
collection.add(element.getObject());
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarConstants.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarConstants.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarConstants.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.calendar;
import org.apache.isis.viewer.dnd.drawing.Color;
@@ -25,7 +24,6 @@ import org.apache.isis.viewer.dnd.drawin
import org.apache.isis.viewer.dnd.drawing.Text;
import org.apache.isis.viewer.dnd.view.Toolkit;
-
public class CalendarConstants {
public final static String[] days = new String[] { "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" };
public final static Color textColor = Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1);
@@ -34,4 +32,3 @@ public class CalendarConstants {
public final static Text style = Toolkit.getText(ColorsAndFonts.TEXT_NORMAL);
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarGrid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarGrid.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarGrid.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarGrid.java Tue May 3 07:18:19 2011
@@ -17,10 +17,8 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.calendar;
-
import java.util.Date;
import java.util.List;
@@ -58,21 +56,23 @@ public class CalendarGrid extends Compos
@Override
protected void buildNewView() {
- CalendarCellContent[] cellContents = createContentForCells();
+ final CalendarCellContent[] cellContents = createContentForCells();
addCellsToView(cellContents);
}
- private void addCellsToView(CalendarCellContent[] cellContents) {
- View[] cells = new View[rows * columns];
+ private void addCellsToView(final CalendarCellContent[] cellContents) {
+ final View[] cells = new View[rows * columns];
for (int row = 0; row < rows; row++) {
for (int column = 0; column < columns; column++) {
- int cellNo = acrossThenDown ? row * columns + column : column * rows + row;
+ final int cellNo = acrossThenDown ? row * columns + column : column * rows + row;
View cell;
if (cellContents[cellNo] == null) {
cell = new BlankView(new NullContent());
} else {
- cell = new CompositeViewUsingBuilder(cellContents[cellNo], null, new Axes(), new StackLayout(), new CollectionElementBuilder(new IconElementFactory()));
- cell = new ScrollBorder(cell);
+ cell =
+ new CompositeViewUsingBuilder(cellContents[cellNo], null, new Axes(), new StackLayout(),
+ new CollectionElementBuilder(new IconElementFactory()));
+ cell = new ScrollBorder(cell);
}
cells[cellNo] = cell;
addView(cell);
@@ -81,14 +81,14 @@ public class CalendarGrid extends Compos
}
private CalendarCellContent[] createContentForCells() {
- CalendarCellContent[] cellContents = new CalendarCellContent[rows * columns];
- CollectionContent content = (CollectionContent) getContent();
- for (ObjectAdapter element: content.elements()) {
- Date date = dateFor(element);
+ final CalendarCellContent[] cellContents = new CalendarCellContent[rows * columns];
+ final CollectionContent content = (CollectionContent) getContent();
+ for (final ObjectAdapter element : content.elements()) {
+ final Date date = dateFor(element);
if (date == null) {
continue;
}
- int period = cellLayout.getPeriodFor(date);
+ final int period = cellLayout.getPeriodFor(date);
if (period >= 0 && period < cellContents.length) {
if (cellContents[period] == null) {
cellContents[period] = new CalendarCellContent(cellLayout.title(period));
@@ -98,8 +98,8 @@ public class CalendarGrid extends Compos
}
return cellContents;
}
-
- private Date dateFor(ObjectAdapter element) {
+
+ private Date dateFor(final ObjectAdapter element) {
final ObjectAssociation dateField = findDate(element);
if (dateField == null) {
return null;
@@ -109,7 +109,7 @@ public class CalendarGrid extends Compos
final Date date = facet.dateValue(field);
return date;
}
-
+
private ObjectAssociation findDate(final ObjectAdapter adapter) {
final ObjectSpecification spec = adapter.getSpecification();
final List<ObjectAssociation> fields = spec.getAssociations();
@@ -127,7 +127,7 @@ public class CalendarGrid extends Compos
disposeContentsOnly();
buildNewView();
}
-
+
// TODO remove
@Override
protected void buildView() {
@@ -135,23 +135,24 @@ public class CalendarGrid extends Compos
}
@Override
- protected void doLayout(Size maximumSize) {
- boolean hasHeader = cellLayout.header(0) != null;
- int topInset = 0 + (acrossThenDown && hasHeader ? 30 : 0);
- int leftInset = !acrossThenDown && hasHeader ? 50 : 0;
- int width = maximumSize.getWidth();
- int height = maximumSize.getHeight();
- int columnWidth = (width - leftInset) / columns;
- int rowHeight = (height - topInset) / rows;
+ protected void doLayout(final Size maximumSize) {
+ final boolean hasHeader = cellLayout.header(0) != null;
+ final int topInset = 0 + (acrossThenDown && hasHeader ? 30 : 0);
+ final int leftInset = !acrossThenDown && hasHeader ? 50 : 0;
+ final int width = maximumSize.getWidth();
+ final int height = maximumSize.getHeight();
+ final int columnWidth = (width - leftInset) / columns;
+ final int rowHeight = (height - topInset) / rows;
- View[] cells = getSubviews();
+ final View[] cells = getSubviews();
int i = 0;
- int top = CalendarConstants.style.getLineHeight() + VPADDING; CalendarConstants.style.getLineSpacing();
- Location location = new Location(leftInset, topInset + top);
- Size size = new Size(columnWidth, rowHeight - top);
+ final int top = CalendarConstants.style.getLineHeight() + VPADDING;
+ CalendarConstants.style.getLineSpacing();
+ final Location location = new Location(leftInset, topInset + top);
+ final Size size = new Size(columnWidth, rowHeight - top);
for (int row = 0; row < rows; row++) {
for (int column = 0; column < columns; column++) {
- View cell = cells[i++];
+ final View cell = cells[i++];
cell.setSize(size);
cell.setLocation(location);
location.add(columnWidth, 0);
@@ -162,11 +163,11 @@ public class CalendarGrid extends Compos
}
@Override
- public Size requiredSize(Size availableSpace) {
+ public Size requiredSize(final Size availableSpace) {
return new Size(300, 300);
}
-
- protected CalendarGrid(Content content) {
+
+ protected CalendarGrid(final Content content) {
super(content, null);
cellLayout = new DayCells(null);
@@ -178,44 +179,46 @@ public class CalendarGrid extends Compos
@Override
public void setFocusManager(final FocusManager focusManager) {
- // this.focusManager = focusManager;
+ // this.focusManager = focusManager;
}
@Override
- public void draw(Canvas canvas) {
+ public void draw(final Canvas canvas) {
super.draw(canvas);
-
- boolean hasHeader = cellLayout.header(0) != null;
- int topInset = 0 + (acrossThenDown && hasHeader ? 30 : 0);
- int leftInset = !acrossThenDown && hasHeader ? 50 : 0;
- int width = getSize().getWidth();
- int height = getSize().getHeight();
- int columnWidth = (width - leftInset) / columns;
- int rowHeight = (height - topInset) / rows;
+
+ final boolean hasHeader = cellLayout.header(0) != null;
+ final int topInset = 0 + (acrossThenDown && hasHeader ? 30 : 0);
+ final int leftInset = !acrossThenDown && hasHeader ? 50 : 0;
+ final int width = getSize().getWidth();
+ final int height = getSize().getHeight();
+ final int columnWidth = (width - leftInset) / columns;
+ final int rowHeight = (height - topInset) / rows;
for (int row = 0; row < rows; row++) {
- int y = topInset + row * rowHeight;
+ final int y = topInset + row * rowHeight;
if (!acrossThenDown && hasHeader) {
- canvas.drawText(cellLayout.header(row), 0, y + 20, CalendarConstants.textColor, CalendarConstants.style);
+ canvas
+ .drawText(cellLayout.header(row), 0, y + 20, CalendarConstants.textColor, CalendarConstants.style);
}
canvas.drawLine(leftInset, y, width, y, CalendarConstants.lineColor);
}
canvas.drawLine(leftInset, topInset + height - 1, width, topInset + height - 1, CalendarConstants.lineColor);
for (int column = 0; column < columns; column++) {
- int x = leftInset + column * columnWidth;
+ final int x = leftInset + column * columnWidth;
if (acrossThenDown && hasHeader) {
- canvas.drawText(cellLayout.header(column), x, topInset - 5, CalendarConstants.textColor, CalendarConstants.style);
+ canvas.drawText(cellLayout.header(column), x, topInset - 5, CalendarConstants.textColor,
+ CalendarConstants.style);
}
canvas.drawLine(x, topInset, x, topInset + height, CalendarConstants.lineColor);
}
canvas.drawLine(width - 1, topInset, width - 1, height, CalendarConstants.lineColor);
for (int row = 0; row < rows; row++) {
- int y = topInset + row * rowHeight + CalendarConstants.style.getAscent() + 2;
+ final int y = topInset + row * rowHeight + CalendarConstants.style.getAscent() + 2;
for (int column = 0; column < columns; column++) {
- int x = leftInset + column * columnWidth + 2;
- int cell = acrossThenDown ? row * columns + column : column * rows + row;
+ final int x = leftInset + column * columnWidth + 2;
+ final int cell = acrossThenDown ? row * columns + column : column * rows + row;
canvas.drawText(cellLayout.title(cell), x, y, CalendarConstants.textColor, CalendarConstants.style);
}
}
@@ -280,7 +283,7 @@ public class CalendarGrid extends Compos
void acrossFirst() {
acrossThenDown = true;
- int temp = rows;
+ final int temp = rows;
rows = columns;
columns = temp;
invalidateContent();
@@ -289,7 +292,7 @@ public class CalendarGrid extends Compos
void downFirst() {
acrossThenDown = false;
- int temp = rows;
+ final int temp = rows;
rows = columns;
columns = temp;
invalidateContent();
@@ -315,105 +318,103 @@ public class CalendarGrid extends Compos
}
@Override
- public void viewMenuOptions(UserActionSet options) {
+ public void viewMenuOptions(final UserActionSet options) {
super.viewMenuOptions(options);
options.add(new UserActionAbstract("Add row") {
@Override
- public void execute(Workspace workspace, View view, Location at) {
+ public void execute(final Workspace workspace, final View view, final Location at) {
addRow();
}
});
options.add(new UserActionAbstract("Remove row") {
@Override
- public void execute(Workspace workspace, View view, Location at) {
+ public void execute(final Workspace workspace, final View view, final Location at) {
removeRow();
}
});
options.add(new UserActionAbstract("Add column") {
@Override
- public void execute(Workspace workspace, View view, Location at) {
+ public void execute(final Workspace workspace, final View view, final Location at) {
addColumn();
}
});
options.add(new UserActionAbstract("Remove column") {
@Override
- public void execute(Workspace workspace, View view, Location at) {
+ public void execute(final Workspace workspace, final View view, final Location at) {
removeColumn();
}
});
options.add(new UserActionAbstract("Years") {
@Override
- public void execute(Workspace workspace, View view, Location at) {
+ public void execute(final Workspace workspace, final View view, final Location at) {
showYears();
}
});
options.add(new UserActionAbstract("Months") {
@Override
- public void execute(Workspace workspace, View view, Location at) {
+ public void execute(final Workspace workspace, final View view, final Location at) {
showMonths();
}
});
options.add(new UserActionAbstract("Weeks") {
@Override
- public void execute(Workspace workspace, View view, Location at) {
+ public void execute(final Workspace workspace, final View view, final Location at) {
showWeeks();
}
});
options.add(new UserActionAbstract("Day") {
@Override
- public void execute(Workspace workspace, View view, Location at) {
+ public void execute(final Workspace workspace, final View view, final Location at) {
showSingleDay();
}
});
options.add(new UserActionAbstract("Days") {
@Override
- public void execute(Workspace workspace, View view, Location at) {
+ public void execute(final Workspace workspace, final View view, final Location at) {
showDays();
}
});
options.add(new UserActionAbstract("Across then down") {
@Override
- public void execute(Workspace workspace, View view, Location at) {
- acrossFirst();
+ public void execute(final Workspace workspace, final View view, final Location at) {
+ acrossFirst();
}
});
options.add(new UserActionAbstract("Down then across") {
@Override
- public void execute(Workspace workspace, View view, Location at) {
+ public void execute(final Workspace workspace, final View view, final Location at) {
downFirst();
}
});
options.add(new UserActionAbstract("Previous period") {
@Override
- public void execute(Workspace workspace, View view, Location at) {
+ public void execute(final Workspace workspace, final View view, final Location at) {
previousePeriod();
}
});
options.add(new UserActionAbstract("Next period") {
@Override
- public void execute(Workspace workspace, View view, Location at) {
+ public void execute(final Workspace workspace, final View view, final Location at) {
nextPeriod();
}
});
options.add(new UserActionAbstract("Today") {
@Override
- public void execute(Workspace workspace, View view, Location at) {
+ public void execute(final Workspace workspace, final View view, final Location at) {
today();
}
});
}
}
-
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarSpecification.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.calendar;
import java.util.List;
@@ -34,27 +33,29 @@ import org.apache.isis.viewer.dnd.view.c
import org.apache.isis.viewer.dnd.view.composite.StackLayout;
import org.apache.isis.viewer.dnd.view.composite.ViewBuilder;
-
public class CalendarSpecification implements CompositeViewSpecification {
-
- public Layout createLayout(Content content, Axes axes) {
+
+ public Layout createLayout(final Content content, final Axes axes) {
return new StackLayout();
}
- public void createAxes(Content content, Axes axes) {
- //axes.add(new CalendarAxis());
+ public void createAxes(final Content content, final Axes axes) {
+ // axes.add(new CalendarAxis());
}
- public View createView(Content content, Axes axes, int sequence) {
+ @Override
+ public View createView(final Content content, final Axes axes, final int sequence) {
return new CalendarView(content, this);
- //return new ViewResizeBorder(new CalendarView(content, this));
+ // return new ViewResizeBorder(new CalendarView(content, this));
}
- public boolean canDisplay(ViewRequirement requirement) {
- boolean openCollection =requirement.isCollection() && requirement.isOpen();
+ @Override
+ public boolean canDisplay(final ViewRequirement requirement) {
+ final boolean openCollection = requirement.isCollection() && requirement.isOpen();
if (openCollection) {
- List<OneToOneAssociation> propertyList = ((CollectionContent) requirement.getContent()).getElementSpecification().getProperties();
- for (OneToOneAssociation association : propertyList) {
+ final List<OneToOneAssociation> propertyList =
+ ((CollectionContent) requirement.getContent()).getElementSpecification().getProperties();
+ for (final OneToOneAssociation association : propertyList) {
if (!association.isAlwaysHidden() && association.getSpecification().containsFacet(DateValueFacet.class)) {
return true;
}
@@ -63,18 +64,22 @@ public class CalendarSpecification imple
return false;
}
+ @Override
public String getName() {
return "Calendar (experimental) ";
}
+ @Override
public boolean isOpen() {
return true;
}
+ @Override
public boolean isReplaceable() {
return true;
}
+ @Override
public boolean isSubView() {
return false;
}
@@ -83,14 +88,14 @@ public class CalendarSpecification imple
return null;
}
+ @Override
public boolean isAligned() {
return false;
}
+ @Override
public boolean isResizeable() {
return true;
}
-
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.calendar;
import org.apache.isis.viewer.dnd.drawing.Bounds;
@@ -36,134 +35,148 @@ import org.apache.isis.viewer.dnd.view.c
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);
- protected CalendarView(Content content, ViewSpecification specification) {
+ protected CalendarView(final Content content, final ViewSpecification specification) {
super(content, specification);
}
- public void doLayout(Size maximumSize) {
+ @Override
+ public void doLayout(final Size maximumSize) {
LOG.debug("doLayout() " + maximumSize + " " + getSize());
- View toolbar = getSubviews()[0];
+ final View toolbar = getSubviews()[0];
maximumSize.contract(getPadding());
- Size toolbarSize = toolbar.getRequiredSize(maximumSize);
+ final Size toolbarSize = toolbar.getRequiredSize(maximumSize);
LOG.debug(" toolbar " + toolbarSize);
Bounds bounds = new Bounds(toolbarSize);
toolbar.setBounds(bounds);
-
- View grid = getSubviews()[1];
- Size gridSize = getRequiredSize(Size.createMax());
+ final View grid = getSubviews()[1];
+ final Size gridSize = getRequiredSize(Size.createMax());
gridSize.contract(getPadding());
gridSize.contractHeight(toolbarSize.getHeight());
bounds = new Bounds(new Location(0, toolbarSize.getHeight()), gridSize);
grid.setBounds(bounds);
LOG.debug(" grid " + toolbarSize);
-
+
}
@Override
public void setFocusManager(final FocusManager focusManager) {
- // this.focusManager = focusManager;
+ // this.focusManager = focusManager;
}
@Override
- public Size requiredSize(Size availableSpace) {
- Size workspace = getWorkspace().getSize();
+ public Size requiredSize(final Size availableSpace) {
+ final Size workspace = getWorkspace().getSize();
return new Size((int) (workspace.getWidth() * 0.8), (int) (workspace.getHeight() * 0.8));
}
+ @Override
protected void buildView() {
if (subviews().length == 0) {
- CalendarGrid grid = new CalendarGrid(getContent());
- ToolbarView toolbar = createToolbar(grid);
+ final CalendarGrid grid = new CalendarGrid(getContent());
+ final ToolbarView toolbar = createToolbar(grid);
addView(toolbar);
- addView(grid);
+ addView(grid);
} else {
// TODO update grid view
}
}
private ToolbarView createToolbar(final CalendarGrid calendar) {
- ToolbarView toolbarView = new ToolbarView(getContent(), null);
-
+ final ToolbarView toolbarView = new ToolbarView(getContent(), null);
+
toolbarView.addView(new Button(new AbstractButtonAction("+Row") {
- public void execute(Workspace workspace, View view, Location at) {
+ @Override
+ public void execute(final Workspace workspace, final View view, final Location at) {
calendar.addRow();
}
}, this));
toolbarView.addView(new Button(new AbstractButtonAction("-Row") {
- public void execute(Workspace workspace, View view, Location at) {
+ @Override
+ public void execute(final Workspace workspace, final View view, final Location at) {
calendar.removeRow();
}
}, this));
toolbarView.addView(new Button(new AbstractButtonAction("Across") {
- public void execute(Workspace workspace, View view, Location at) {
+ @Override
+ public void execute(final Workspace workspace, final View view, final Location at) {
calendar.acrossFirst();
}
}, this));
toolbarView.addView(new Button(new AbstractButtonAction("Down") {
- public void execute(Workspace workspace, View view, Location at) {
+ @Override
+ public void execute(final Workspace workspace, final View view, final Location at) {
calendar.downFirst();
}
}, this));
toolbarView.addView(new Button(new AbstractButtonAction("Next") {
- public void execute(Workspace workspace, View view, Location at) {
+ @Override
+ public void execute(final Workspace workspace, final View view, final Location at) {
calendar.nextPeriod();
}
}, this));
toolbarView.addView(new Button(new AbstractButtonAction("Previous") {
- public void execute(Workspace workspace, View view, Location at) {
+ @Override
+ public void execute(final Workspace workspace, final View view, final Location at) {
calendar.previousePeriod();
}
}, this));
toolbarView.addView(new Button(new AbstractButtonAction("Day") {
- public void execute(Workspace workspace, View view, Location at) {
+ @Override
+ public void execute(final Workspace workspace, final View view, final Location at) {
calendar.showSingleDay();
}
}, this));
toolbarView.addView(new Button(new AbstractButtonAction("Days") {
- public void execute(Workspace workspace, View view, Location at) {
+ @Override
+ public void execute(final Workspace workspace, final View view, final Location at) {
calendar.showDays();
}
}, this));
toolbarView.addView(new Button(new AbstractButtonAction("Weeks") {
- public void execute(Workspace workspace, View view, Location at) {
+ @Override
+ public void execute(final Workspace workspace, final View view, final Location at) {
calendar.showWeeks();
}
}, this));
toolbarView.addView(new Button(new AbstractButtonAction("Months") {
- public void execute(Workspace workspace, View view, Location at) {
+ @Override
+ public void execute(final Workspace workspace, final View view, final Location at) {
calendar.showMonths();
}
}, this));
toolbarView.addView(new Button(new AbstractButtonAction("Years") {
- public void execute(Workspace workspace, View view, Location at) {
+ @Override
+ public void execute(final Workspace workspace, final View view, final Location at) {
calendar.showYears();
}
}, this));
toolbarView.addView(new Button(new AbstractButtonAction("Today") {
- public void execute(Workspace workspace, View view, Location at) {
+ @Override
+ public void execute(final Workspace workspace, final View view, final Location at) {
calendar.today();
}
}, this));
toolbarView.addView(new Button(new AbstractButtonAction("Date") {
- public void execute(Workspace workspace, View view, Location at) {
- Content content = new NullContent() {};
+ @Override
+ public void execute(final Workspace workspace, View view, final Location at) {
+ final Content content = new NullContent() {
+ };
view = DatePickerControl.getPicker(content);
calendar.today();
getViewManager().setOverlayView(view);
@@ -174,12 +187,10 @@ public class CalendarView extends Compos
}
/*
- * public void invalidateLayout() { // super.invalidateLayout(); View parent = getParent(); if (parent !=
- * null) { // parent.invalidateLayout(); } isInvalid = true; View toolbar = getSubviews()[0];
- * toolbar.invalidateLayout(); // View grid = getSubviews()[1]; // grid.invalidateLayout(); }
- protected boolean isLayoutInvalid() {
- return isInvalid;
- }
+ * public void invalidateLayout() { // super.invalidateLayout(); View parent = getParent(); if (parent != null) { //
+ * parent.invalidateLayout(); } isInvalid = true; View toolbar = getSubviews()[0]; toolbar.invalidateLayout(); //
+ * View grid = getSubviews()[1]; // grid.invalidateLayout(); } protected boolean isLayoutInvalid() { return
+ * isInvalid; }
*/
}
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cell.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cell.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cell.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cell.java Tue May 3 07:18:19 2011
@@ -17,11 +17,8 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.calendar;
public class Cell {
}
-
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cells.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cells.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cells.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/Cells.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.calendar;
import java.text.DateFormat;
@@ -25,30 +24,30 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-
public abstract class Cells {
protected final DateFormat monthFormat = new SimpleDateFormat("MMM");
protected final DateFormat dayFormat = new SimpleDateFormat("EEE");
protected Calendar date;
- public Cells(Cells replacing) {
+ public Cells(final Cells replacing) {
if (replacing == null) {
today();
} else {
date = replacing.date;
}
}
-
+
public void today() {
date = Calendar.getInstance();
roundDown();
}
- public final void setDate(Calendar date) {
+ public final void setDate(final Calendar date) {
this.date = date;
}
- public void roundDown() { }
+ public void roundDown() {
+ }
abstract int defaultRows();
@@ -58,19 +57,18 @@ public abstract class Cells {
abstract String title(int cell);
- public String header(int cell) {
+ public String header(final int cell) {
return null;
}
- public int getPeriodFor(Date date) {
- Calendar forDate = Calendar.getInstance();
+ public int getPeriodFor(final Date date) {
+ final Calendar forDate = Calendar.getInstance();
forDate.setTime(date);
- int baseline = period(this.date);
- int comparativePeriod = period(forDate);
+ final int baseline = period(this.date);
+ final int comparativePeriod = period(forDate);
return baseline - comparativePeriod;
}
protected abstract int period(Calendar forDate);
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/DayCells.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/DayCells.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/DayCells.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/DayCells.java Tue May 3 07:18:19 2011
@@ -17,52 +17,56 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.calendar;
import java.util.Calendar;
-
public class DayCells extends Cells {
- public DayCells(Cells replacing) {
+ public DayCells(final Cells replacing) {
super(replacing);
}
+ @Override
public int defaultColumns() {
return 7;
}
+ @Override
public int defaultRows() {
return 2;
}
- public void add(int interval) {
+ @Override
+ public void add(final int interval) {
date.add(Calendar.DAY_OF_WEEK, interval);
}
+ @Override
public void roundDown() {
- int offset = date.get(Calendar.DAY_OF_WEEK) - date.getFirstDayOfWeek();
+ final int offset = date.get(Calendar.DAY_OF_WEEK) - date.getFirstDayOfWeek();
date.add(Calendar.DAY_OF_MONTH, -offset);
}
- public String title(int cell) {
- Calendar d = (Calendar) date.clone();
+ @Override
+ public String title(final int cell) {
+ final Calendar d = (Calendar) date.clone();
d.add(Calendar.DAY_OF_WEEK, cell);
- String displayName = dayFormat.format(d.getTime()) + " " + d.get(Calendar.DAY_OF_MONTH) + " "
- + monthFormat.format(d.getTime());
+ final String displayName =
+ dayFormat.format(d.getTime()) + " " + d.get(Calendar.DAY_OF_MONTH) + " " + monthFormat.format(d.getTime());
return displayName;
}
- public String header(int cell) {
- Calendar d = (Calendar) date.clone();
+ @Override
+ public String header(final int cell) {
+ final Calendar d = (Calendar) date.clone();
d.add(Calendar.DAY_OF_WEEK, cell);
return dayFormat.format(d.getTime());
}
- protected int period(Calendar forDate) {
+ @Override
+ protected int period(final Calendar forDate) {
return forDate.get(Calendar.YEAR) * 12 - forDate.get(Calendar.DAY_OF_YEAR);
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/MonthCells.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/MonthCells.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/MonthCells.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/MonthCells.java Tue May 3 07:18:19 2011
@@ -17,43 +17,46 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.calendar;
import java.util.Calendar;
-
public class MonthCells extends Cells {
- public MonthCells(Cells replacing) {
+ public MonthCells(final Cells replacing) {
super(replacing);
}
+ @Override
public int defaultColumns() {
return 4;
}
+ @Override
public int defaultRows() {
return 3;
}
+ @Override
public void roundDown() {
date.set(Calendar.MONTH, 0);
}
- public void add(int interval) {
+ @Override
+ public void add(final int interval) {
date.add(Calendar.MONTH, interval);
}
- public String title(int cell) {
- Calendar d = (Calendar) date.clone();
+ @Override
+ public String title(final int cell) {
+ final Calendar d = (Calendar) date.clone();
d.add(Calendar.MONTH, cell);
- String displayName = monthFormat.format(d.getTime()) + " " + d.get(Calendar.YEAR);
+ final String displayName = monthFormat.format(d.getTime()) + " " + d.get(Calendar.YEAR);
return displayName;
}
- protected int period(Calendar forDate) {
+ @Override
+ protected int period(final Calendar forDate) {
return forDate.get(Calendar.YEAR) * 12 - forDate.get(Calendar.MONTH);
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/SingleDayCells.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/SingleDayCells.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/SingleDayCells.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/SingleDayCells.java Tue May 3 07:18:19 2011
@@ -17,41 +17,43 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.calendar;
import java.util.Calendar;
-
public class SingleDayCells extends Cells {
- public SingleDayCells(Cells replacing) {
+ public SingleDayCells(final Cells replacing) {
super(replacing);
}
+ @Override
public int defaultColumns() {
return 1;
}
+ @Override
public int defaultRows() {
return 1;
}
- public void add(int interval) {
+ @Override
+ public void add(final int interval) {
date.add(Calendar.DAY_OF_WEEK, interval);
}
- public String title(int cell) {
- Calendar d = (Calendar) date.clone();
+ @Override
+ public String title(final int cell) {
+ final Calendar d = (Calendar) date.clone();
d.add(Calendar.DAY_OF_WEEK, cell);
- String displayName = dayFormat.format(d.getTime()) + " " + d.get(Calendar.DAY_OF_MONTH) + " "
- + monthFormat.format(d.getTime());
+ final String displayName =
+ dayFormat.format(d.getTime()) + " " + d.get(Calendar.DAY_OF_MONTH) + " " + monthFormat.format(d.getTime());
return displayName;
}
- protected int period(Calendar forDate) {
+ @Override
+ protected int period(final Calendar forDate) {
return forDate.get(Calendar.YEAR) * 12 - forDate.get(Calendar.DAY_OF_YEAR);
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/WeekCells.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/WeekCells.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/WeekCells.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/WeekCells.java Tue May 3 07:18:19 2011
@@ -17,43 +17,45 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.calendar;
import java.util.Calendar;
-
public class WeekCells extends Cells {
- public WeekCells(Cells replacing) {
+ public WeekCells(final Cells replacing) {
super(replacing);
}
+ @Override
public int defaultColumns() {
return 4;
}
+ @Override
public int defaultRows() {
return 3;
}
- public void add(int interval) {
+ @Override
+ public void add(final int interval) {
add(date, interval);
}
- public void add(Calendar d, int interval) {
+ public void add(final Calendar d, final int interval) {
d.add(Calendar.DAY_OF_MONTH, 7 * interval);
}
- public String title(int cell) {
- Calendar d = (Calendar) date.clone();
+ @Override
+ public String title(final int cell) {
+ final Calendar d = (Calendar) date.clone();
add(d, cell);
- String displayName = d.get(Calendar.DAY_OF_MONTH) + " " + monthFormat.format(d.getTime());
+ final String displayName = d.get(Calendar.DAY_OF_MONTH) + " " + monthFormat.format(d.getTime());
return "w/b " + displayName;
}
- protected int period(Calendar forDate) {
+ @Override
+ protected int period(final Calendar forDate) {
return forDate.get(Calendar.YEAR) * 12 - forDate.get(Calendar.WEEK_OF_YEAR);
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/YearCells.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/YearCells.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/YearCells.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/calendar/YearCells.java Tue May 3 07:18:19 2011
@@ -17,39 +17,41 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.calendar;
import java.util.Calendar;
-
public class YearCells extends Cells {
- public YearCells(Cells replacing) {
+ public YearCells(final Cells replacing) {
super(replacing);
}
+ @Override
public int defaultColumns() {
return 4;
}
+ @Override
public int defaultRows() {
return 2;
}
- public void add(int interval) {
+ @Override
+ public void add(final int interval) {
date.add(Calendar.YEAR, interval);
}
- public String title(int cell) {
- Calendar d = (Calendar) date.clone();
+ @Override
+ public String title(final int cell) {
+ final Calendar d = (Calendar) date.clone();
d.add(Calendar.YEAR, cell);
- String displayName = d.get(Calendar.YEAR) + "";
+ final String displayName = d.get(Calendar.YEAR) + "";
return displayName;
}
- protected int period(Calendar forDate) {
+ @Override
+ protected int period(final Calendar forDate) {
return forDate.get(Calendar.YEAR);
}
}
-
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/ExpandableListSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/ExpandableListSpecification.java?rev=1098945&r1=1098944&r2=1098945&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/ExpandableListSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/combined/ExpandableListSpecification.java Tue May 3 07:18:19 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.viewer.dnd.combined;
import org.apache.isis.viewer.dnd.form.ExpandableViewBorder;
@@ -25,27 +24,27 @@ import org.apache.isis.viewer.dnd.icon.I
import org.apache.isis.viewer.dnd.view.ViewFactory;
import org.apache.isis.viewer.dnd.view.composite.AbstractCollectionViewSpecification;
-
public class ExpandableListSpecification extends AbstractCollectionViewSpecification {
public ExpandableListSpecification() {
builder.addSubviewDecorator(new ExpandableViewBorder.Factory());
}
-
+
+ @Override
protected ViewFactory createElementFactory() {
return new IconElementFactory();
}
+ @Override
public String getName() {
return "Expanding List (experimental)";
}
-
+
// TODO this should be available if an item can be given more space
-/*
- @Override
- public boolean canDisplay(final Content content, ViewRequirement requirement) {
- return content.isCollection() && requirement.is(ViewRequirement.CLOSED) && requirement.is(ViewRequirement.SUBVIEW) && requirement.is(ViewRequirement.SUBVIEW);
- }
- */
-
+ /*
+ * @Override public boolean canDisplay(final Content content, ViewRequirement requirement) { return
+ * content.isCollection() && requirement.is(ViewRequirement.CLOSED) && requirement.is(ViewRequirement.SUBVIEW) &&
+ * requirement.is(ViewRequirement.SUBVIEW); }
+ */
+
}