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 09:05:57 UTC
svn commit: r1234460 [8/30] - in /incubator/isis/trunk/framework/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/...
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/StackLayout.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/StackLayout.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/StackLayout.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/StackLayout.java Sun Jan 22 08:05:17 2012
@@ -25,10 +25,12 @@ import org.apache.isis.viewer.dnd.view.V
import org.apache.isis.viewer.dnd.view.base.Layout;
/**
- * A stack layout stacks its components vertically, one on top of the other, working down from the top. Each component
- * is given the space it requests. Components adopt the width of the widest component when that component's view
- * specification's <code>isAligned</code> method returns <code>true</code>, or the layout's <code>fixedWidth</code> flag
- * is set (via the two parameter constructor).
+ * A stack layout stacks its components vertically, one on top of the other,
+ * working down from the top. Each component is given the space it requests.
+ * Components adopt the width of the widest component when that component's view
+ * specification's <code>isAligned</code> method returns <code>true</code>, or
+ * the layout's <code>fixedWidth</code> flag is set (via the two parameter
+ * constructor).
*
*/
public class StackLayout implements Layout {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ViewBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ViewBuilder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ViewBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/ViewBuilder.java Sun Jan 22 08:05:17 2012
@@ -36,14 +36,17 @@ public interface ViewBuilder {
/**
* Indicates whether this view is expanded, or iconized.
*
- * @return true if it is showing the object's details; false if it is showing the object only.
+ * @return true if it is showing the object's details; false if it is
+ * showing the object only.
*/
boolean isOpen();
/**
- * Indicates whether this view can be replaced with another view (for the same value or reference).
+ * Indicates whether this view can be replaced with another view (for the
+ * same value or reference).
*
- * @return true if it can be replaced by another view; false if it can't be replaces
+ * @return true if it can be replaced by another view; false if it can't be
+ * replaces
*/
boolean isReplaceable();
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java Sun Jan 22 08:05:17 2012
@@ -69,9 +69,7 @@ public abstract class AbstractObjectCont
public void execute(final Workspace workspace, final View view, final Location at) {
final ObjectAdapter object = view.getContent().getAdapter();
final ObjectSpecification spec = object.getSpecification();
- final ObjectAdapter instances =
- IsisContext.getPersistenceSession().findInstances(new QueryFindAllInstances(spec.getFullIdentifier()),
- QueryCardinality.MULTIPLE);
+ final ObjectAdapter instances = IsisContext.getPersistenceSession().findInstances(new QueryFindAllInstances(spec.getFullIdentifier()), QueryCardinality.MULTIPLE);
workspace.objectActionResult(instances, new Placement(view));
}
}
@@ -102,7 +100,8 @@ public abstract class AbstractObjectCont
if (fields.get(i).isOneToOneAssociation()) {
((OneToOneAssociation) fields.get(i)).setAssociation(clone, fld);
} else if (fields.get(i).isOneToManyAssociation()) {
- // clone.setValue((OneToOneAssociation) fields[i], fld.getObject());
+ // clone.setValue((OneToOneAssociation) fields[i],
+ // fld.getObject());
}
}
@@ -119,8 +118,7 @@ public abstract class AbstractObjectCont
@Override
public Consent disabled(final View view) {
final ObjectAdapter object = view.getContent().getAdapter();
- return ConsentAbstract.allowIf(object == null || object.getResolveState() != ResolveState.TRANSIENT
- || object.getResolveState() == ResolveState.GHOST);
+ return ConsentAbstract.allowIf(object == null || object.getResolveState() != ResolveState.TRANSIENT || object.getResolveState() == ResolveState.GHOST);
}
@Override
@@ -161,9 +159,7 @@ public abstract class AbstractObjectCont
// TODO: use Facet for this test instead.
return new Veto("Can't set field in persistent object with reference to non-persistent object");
}
- final List<ObjectAssociation> fields =
- targetAdapter.getSpecification().getAssociations(
- ObjectAssociationFilters.dynamicallyVisible(IsisContext.getAuthenticationSession(), targetAdapter));
+ final List<ObjectAssociation> fields = targetAdapter.getSpecification().getAssociations(ObjectAssociationFilters.dynamicallyVisible(IsisContext.getAuthenticationSession(), targetAdapter));
for (final ObjectAssociation fld : fields) {
if (!fld.isOneToOneAssociation()) {
continue;
@@ -174,16 +170,14 @@ public abstract class AbstractObjectCont
if (fld.get(targetAdapter) != null) {
continue;
}
- final Consent associationValid =
- ((OneToOneAssociation) fld).isAssociationValid(targetAdapter, sourceAdapter);
+ final Consent associationValid = ((OneToOneAssociation) fld).isAssociationValid(targetAdapter, sourceAdapter);
if (associationValid.isAllowed()) {
return associationValid.setDescription("Set field " + fld.getName());
}
}
// TODO: use Facet for this test instead
- return new Veto(String.format("No empty field accepting object of type %s in %s", sourceAdapter
- .getSpecification().getSingularName(), title()));
+ return new Veto(String.format("No empty field accepting object of type %s in %s", sourceAdapter.getSpecification().getSingularName(), title()));
}
@Override
@@ -213,14 +207,11 @@ public abstract class AbstractObjectCont
return action.execute(target, new ObjectAdapter[] { source });
}
- final List<ObjectAssociation> associations =
- target.getSpecification().getAssociations(
- ObjectAssociationFilters.dynamicallyVisible(IsisContext.getAuthenticationSession(), target));
+ final List<ObjectAssociation> associations = target.getSpecification().getAssociations(ObjectAssociationFilters.dynamicallyVisible(IsisContext.getAuthenticationSession(), target));
for (int i = 0; i < associations.size(); i++) {
final ObjectAssociation association = associations.get(i);
- if (association.isOneToOneAssociation()
- && source.getSpecification().isOfType(association.getSpecification())) {
+ if (association.isOneToOneAssociation() && source.getSpecification().isOfType(association.getSpecification())) {
final OneToOneAssociation otoa = (OneToOneAssociation) association;
if (association.get(target) == null && otoa.isAssociationValid(target, source).isAllowed()) {
otoa.setAssociation(target, source);
@@ -233,8 +224,7 @@ public abstract class AbstractObjectCont
}
private ObjectAction dropAction(final ObjectAdapter source, final ObjectAdapter target) {
- final ObjectAction action =
- target.getSpecification().getObjectAction(ActionType.USER, null, Arrays.asList(source.getSpecification()));
+ final ObjectAction action = target.getSpecification().getObjectAction(ActionType.USER, null, Arrays.asList(source.getSpecification()));
return action;
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractTextParsableContent.java Sun Jan 22 08:05:17 2012
@@ -63,12 +63,13 @@ public abstract class AbstractTextParsab
* @param propertyOrParamValue
* the target property or parameter
* @param propertyOrParam
- * the {@link ObjectAssociation} or {@link ParseableEntryActionParameter}
+ * the {@link ObjectAssociation} or
+ * {@link ParseableEntryActionParameter}
* @param propertyOrParamTypeSpecification
- * the specification of the type of the property or parameter (for fallback).
+ * the specification of the type of the property or parameter
+ * (for fallback).
*/
- protected String titleString(final ObjectAdapter propertyOrParamValue, final FacetHolder propertyOrParam,
- final FacetHolder propertyOrParamTypeSpecification) {
+ protected String titleString(final ObjectAdapter propertyOrParamValue, final FacetHolder propertyOrParam, final FacetHolder propertyOrParamTypeSpecification) {
final TitleFacet titleFacet = propertyOrParam.getFacet(TitleFacet.class);
if (titleFacet != null) {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java Sun Jan 22 08:05:17 2012
@@ -66,8 +66,7 @@ public class RootObject extends Abstract
@Override
public String getDescription() {
- return getSpecification().getSingularName() + ": " + getObject().titleString() + " "
- + getSpecification().getDescription();
+ return getSpecification().getSingularName() + ": " + getObject().titleString() + " " + getSpecification().getDescription();
}
@Override
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractControlView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractControlView.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractControlView.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/AbstractControlView.java Sun Jan 22 08:05:17 2012
@@ -173,8 +173,7 @@ public abstract class AbstractControlVie
public void entered() {
final View target = getParent();
final Consent consent = action.disabled(target);
- final String actionText =
- action.getName(target) + " - " + (consent.isVetoed() ? consent.getReason() : action.getDescription(target));
+ final String actionText = action.getName(target) + " - " + (consent.isVetoed() ? consent.getReason() : action.getDescription(target));
getFeedbackManager().setAction(actionText);
isOver = true;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/ButtonRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/ButtonRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/ButtonRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/control/ButtonRender.java Sun Jan 22 08:05:17 2012
@@ -24,8 +24,7 @@ import org.apache.isis.viewer.dnd.drawin
public interface ButtonRender {
- void draw(Canvas canvas, Size size, boolean isDisabled, boolean isDefault, boolean hasFocus, boolean isOver,
- boolean isPressed, String text);
+ void draw(Canvas canvas, Size size, boolean isDisabled, boolean isDefault, boolean hasFocus, boolean isOver, boolean isPressed, String text);
Size getMaximumSize(String text);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugOutput.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugOutput.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugOutput.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugOutput.java Sun Jan 22 08:05:17 2012
@@ -89,12 +89,15 @@ public class DebugOutput {
/*
*
*
- * Frame frame = new Frame(); PrintJob job = Toolkit.getDefaultToolkit().getPrintJob(frame, "Print object", null);
+ * Frame frame = new Frame(); PrintJob job =
+ * Toolkit.getDefaultToolkit().getPrintJob(frame, "Print object", null);
*
- * if (job != null) { Graphics pg = job.getGraphics(); Dimension pageSize = job.getPageDimension();
+ * if (job != null) { Graphics pg = job.getGraphics(); Dimension pageSize =
+ * job.getPageDimension();
*
- * if (pg != null) { pg.translate(LEFT, HEIGHT); pg.drawRect(0, 0, pageSize.width - LEFT - 1, pageSize.height -
- * HEIGHT - 1); view.print(new PrintCanvas(pg, view)); pg.dispose(); }
+ * if (pg != null) { pg.translate(LEFT, HEIGHT); pg.drawRect(0, 0,
+ * pageSize.width - LEFT - 1, pageSize.height - HEIGHT - 1); view.print(new
+ * PrintCanvas(pg, view)); pg.dispose(); }
*
* job.end(); } frame.dispose();
*/
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=1234460&r1=1234459&r2=1234460&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 08:05:17 2012
@@ -36,8 +36,7 @@ public class OneToManyFieldElementImpl e
private final ObjectAdapter element;
private final ObjectField field;
- public OneToManyFieldElementImpl(final ObjectAdapter parent, final ObjectAdapter element,
- final OneToManyAssociation association) {
+ public OneToManyFieldElementImpl(final ObjectAdapter parent, final ObjectAdapter element, final OneToManyAssociation association) {
field = new ObjectField(parent, association);
this.element = element;
}
@@ -153,9 +152,12 @@ public class OneToManyFieldElementImpl e
@Override
public void setObject(final ObjectAdapter object) {
/*
- * ObjectAdapter parentObject = getParent(); OneToManyAssociationSpecification association =
- * getOneToManyAssociation(); ObjectAdapter associatedObject = getObject(); LOG.debug("remove " +
- * associatedObject + " from " + parentObject); association.clearAssociation(parentObject, associatedObject);
+ * ObjectAdapter parentObject = getParent();
+ * OneToManyAssociationSpecification association =
+ * getOneToManyAssociation(); ObjectAdapter associatedObject =
+ * getObject(); LOG.debug("remove " + associatedObject + " from " +
+ * parentObject); association.clearAssociation(parentObject,
+ * associatedObject);
*/
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java Sun Jan 22 08:05:17 2012
@@ -38,8 +38,7 @@ public class OneToManyFieldImpl extends
private final ObjectAdapter collection;
private final ObjectField field;
- public OneToManyFieldImpl(final ObjectAdapter parent, final ObjectAdapter object,
- final OneToManyAssociation association) {
+ public OneToManyFieldImpl(final ObjectAdapter parent, final ObjectAdapter object, final OneToManyAssociation association) {
field = new ObjectField(parent, association);
this.collection = object;
}
@@ -56,8 +55,7 @@ public class OneToManyFieldImpl extends
return new Veto("Collection not set up; can't add elements to a non-existant collection");
}
- final Consent usableInState =
- getOneToManyAssociation().isUsable(IsisContext.getAuthenticationSession(), parentAdapter);
+ final Consent usableInState = getOneToManyAssociation().isUsable(IsisContext.getAuthenticationSession(), parentAdapter);
if (usableInState.isVetoed()) {
return usableInState;
}
@@ -66,8 +64,7 @@ public class OneToManyFieldImpl extends
final ObjectSpecification elementSpecification = getElementSpecification();
if (!specification.isOfType(elementSpecification)) {
// TODO: move logic into Facet
- return new Veto(String.format("Only objects of type %s are allowed in this collection",
- elementSpecification.getSingularName()));
+ return new Veto(String.format("Only objects of type %s are allowed in this collection", elementSpecification.getSingularName()));
}
if (parentAdapter.isPersistent() && sourceAdapter.isTransient()) {
// TODO: move logic into Facet
@@ -86,7 +83,8 @@ public class OneToManyFieldImpl extends
@Override
public void contentMenuOptions(final UserActionSet options) {
super.contentMenuOptions(options);
- // OptionFactory.addCreateOptions(getOneToManyAssociation().getSpecification(), options);
+ // OptionFactory.addCreateOptions(getOneToManyAssociation().getSpecification(),
+ // options);
}
@Override
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java Sun Jan 22 08:05:17 2012
@@ -36,8 +36,7 @@ public class OneToOneFieldImpl extends A
private final ObjectField field;
private final ObjectAdapter adapter;
- public OneToOneFieldImpl(final ObjectAdapter parentAdapter, final ObjectAdapter adapter,
- final OneToOneAssociation association) {
+ public OneToOneFieldImpl(final ObjectAdapter parentAdapter, final ObjectAdapter adapter, final OneToOneAssociation association) {
field = new ObjectField(parentAdapter, association);
this.adapter = adapter;
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/TextParseableFieldImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/TextParseableFieldImpl.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/TextParseableFieldImpl.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/TextParseableFieldImpl.java Sun Jan 22 08:05:17 2012
@@ -42,8 +42,7 @@ public class TextParseableFieldImpl exte
private final ObjectAdapter parent;
private ObjectAdapter object;
- public TextParseableFieldImpl(final ObjectAdapter parent, final ObjectAdapter object,
- final OneToOneAssociation association) {
+ public TextParseableFieldImpl(final ObjectAdapter parent, final ObjectAdapter object, final OneToOneAssociation association) {
field = new ObjectField(parent, association);
this.parent = parent;
this.object = object;
@@ -56,7 +55,8 @@ public class TextParseableFieldImpl exte
@Override
public Consent canClear() {
- return Allow.DEFAULT; // TODO is this flagged anywhere - getValueAssociation().canClear();
+ return Allow.DEFAULT; // TODO is this flagged anywhere -
+ // getValueAssociation().canClear();
}
@Override
@@ -89,9 +89,7 @@ public class TextParseableFieldImpl exte
final String title = object == null ? "" : ": " + object.titleString();
final String name = field.getName();
final ObjectSpecification specification = getSpecification();
- final String type =
- name.indexOf(specification.getShortIdentifier()) == -1 ? "" : " (" + specification.getShortIdentifier()
- + ")";
+ final String type = name.indexOf(specification.getShortIdentifier()) == -1 ? "" : " (" + specification.getShortIdentifier() + ")";
final String description = getValueAssociation().getDescription();
return name + type + title + " " + description;
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/line/ButtonLineStyleRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/line/ButtonLineStyleRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/line/ButtonLineStyleRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/line/ButtonLineStyleRender.java Sun Jan 22 08:05:17 2012
@@ -37,8 +37,7 @@ public class ButtonLineStyleRender imple
}
@Override
- public void draw(final Canvas canvas, final Size size, final boolean isDisabled, final boolean isDefault,
- final boolean hasFocus, final boolean isOver, final boolean isPressed, final String text) {
+ public void draw(final Canvas canvas, final Size size, final boolean isDisabled, final boolean isDefault, final boolean hasFocus, final boolean isOver, final boolean isPressed, final String text) {
final int buttonWidth = TEXT_PADDING + style.stringWidth(text) + TEXT_PADDING;
final Color borderColor;
@@ -58,8 +57,7 @@ public class ButtonLineStyleRender imple
@Override
public Size getMaximumSize(final String text) {
- final int buttonWidth =
- TEXT_PADDING + Toolkit.getText(ColorsAndFonts.TEXT_CONTROL).stringWidth(text) + TEXT_PADDING;
+ final int buttonWidth = TEXT_PADDING + Toolkit.getText(ColorsAndFonts.TEXT_CONTROL).stringWidth(text) + TEXT_PADDING;
return new Size(buttonWidth, buttonHeight);
}
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/line/LineStyleWindowBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/line/LineStyleWindowBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/line/LineStyleWindowBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/line/LineStyleWindowBorder.java Sun Jan 22 08:05:17 2012
@@ -35,28 +35,25 @@ import org.apache.isis.viewer.dnd.view.w
public class LineStyleWindowBorder implements BorderDrawing {
private final static Text TITLE_STYLE = Toolkit.getText(ColorsAndFonts.TEXT_TITLE_SMALL);
- private final int titlebarHeight = Math.max(WindowControl.HEIGHT + View.VPADDING + TITLE_STYLE.getDescent(),
- TITLE_STYLE.getTextHeight());
+ private final int titlebarHeight = Math.max(WindowControl.HEIGHT + View.VPADDING + TITLE_STYLE.getDescent(), TITLE_STYLE.getTextHeight());
@Override
public void debugDetails(final DebugBuilder debug) {
}
@Override
- public void draw(final Canvas canvas, final Size s, final boolean hasFocus, final ViewState state,
- final View[] controls, final String title) {
- final Color borderColor =
- hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_BLACK) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1);
+ public void draw(final Canvas canvas, final Size s, final boolean hasFocus, final ViewState state, final View[] controls, final String title) {
+ final Color borderColor = hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_BLACK) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1);
canvas.drawRectangle(0, 0, s.getWidth(), s.getHeight(), borderColor);
final int y = getTop();
canvas.drawLine(0, y, s.getWidth(), y, borderColor);
final int controlWidth = View.HPADDING + (WindowControl.WIDTH + View.HPADDING) * controls.length;
final String text = TextUtils.limitText(title, TITLE_STYLE, s.getWidth() - controlWidth - View.VPADDING);
- canvas.drawText(text, 6, TITLE_STYLE.getLineHeight(), borderColor,
- Toolkit.getText(ColorsAndFonts.TEXT_TITLE_SMALL));
+ canvas.drawText(text, 6, TITLE_STYLE.getLineHeight(), borderColor, Toolkit.getText(ColorsAndFonts.TEXT_TITLE_SMALL));
}
- // TODO transiency should be flagged elsewhere and dealt with in the draw method.
+ // TODO transiency should be flagged elsewhere and dealt with in the draw
+ // method.
@Override
public void drawTransientMarker(final Canvas canvas, final Size size) {
}
@@ -73,9 +70,7 @@ public class LineStyleWindowBorder imple
@Override
public void getRequiredSize(final Size size, final String title, final View[] controls) {
- final int width =
- getLeft() + View.HPADDING + TITLE_STYLE.stringWidth(title) + View.HPADDING + controls.length
- * (WindowControl.WIDTH + View.HPADDING) + View.HPADDING + getRight();
+ final int width = getLeft() + View.HPADDING + TITLE_STYLE.stringWidth(title) + View.HPADDING + controls.length * (WindowControl.WIDTH + View.HPADDING) + View.HPADDING + getRight();
size.ensureWidth(width);
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/Button3DStyleRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/Button3DStyleRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/Button3DStyleRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/Button3DStyleRender.java Sun Jan 22 08:05:17 2012
@@ -42,8 +42,7 @@ public class Button3DStyleRender impleme
}
@Override
- public void draw(final Canvas canvas, final Size size, final boolean isDisabled, final boolean isDefault,
- final boolean hasFocus, final boolean isOver, final boolean isPressed, final String text) {
+ public void draw(final Canvas canvas, final Size size, final boolean isDisabled, final boolean isDefault, final boolean hasFocus, final boolean isOver, final boolean isPressed, final String text) {
final int x = 0;
final int y = 0;
@@ -51,35 +50,23 @@ public class Button3DStyleRender impleme
canvas.drawSolidRectangle(x, y, buttonWidth, buttonHeight, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
- final Color color =
- isDisabled ? Toolkit.getColor(ColorsAndFonts.COLOR_MENU_DISABLED) : Toolkit
- .getColor(ColorsAndFonts.COLOR_BLACK);
- final Color border =
- isDisabled ? Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3) : Toolkit
- .getColor(ColorsAndFonts.COLOR_SECONDARY2);
- canvas.drawRectangle(
- x,
- y,
- buttonWidth,
- buttonHeight,
- isOver & !isDisabled ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1) : Toolkit
- .getColor(ColorsAndFonts.COLOR_BLACK));
+ final Color color = isDisabled ? Toolkit.getColor(ColorsAndFonts.COLOR_MENU_DISABLED) : Toolkit.getColor(ColorsAndFonts.COLOR_BLACK);
+ final Color border = isDisabled ? Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2);
+ canvas.drawRectangle(x, y, buttonWidth, buttonHeight, isOver & !isDisabled ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1) : Toolkit.getColor(ColorsAndFonts.COLOR_BLACK));
canvas.draw3DRectangle(x + 1, y + 1, buttonWidth - 2, buttonHeight - 2, border, !isPressed);
canvas.draw3DRectangle(x + 2, y + 2, buttonWidth - 4, buttonHeight - 4, border, !isPressed);
if (isDefault) {
canvas.drawRectangle(x + 3, y + 3, buttonWidth - 6, buttonHeight - 6, border);
}
if (hasFocus) {
- canvas.drawRectangle(x + 3, y + 3, buttonWidth - 6, buttonHeight - 6,
- Toolkit.getColor(ColorsAndFonts.COLOR_WHITE));
+ canvas.drawRectangle(x + 3, y + 3, buttonWidth - 6, buttonHeight - 6, Toolkit.getColor(ColorsAndFonts.COLOR_WHITE));
}
canvas.drawText(text, x + TEXT_PADDING, y + buttonHeight / 2 + style.getMidPoint(), color, style);
}
@Override
public Size getMaximumSize(final String text) {
- final int buttonWidth =
- TEXT_PADDING + Toolkit.getText(ColorsAndFonts.TEXT_CONTROL).stringWidth(text) + TEXT_PADDING;
+ final int buttonWidth = TEXT_PADDING + Toolkit.getText(ColorsAndFonts.TEXT_CONTROL).stringWidth(text) + TEXT_PADDING;
return new Size(buttonWidth, buttonHeight);
}
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/CloseWindow3DRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/CloseWindow3DRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/CloseWindow3DRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/CloseWindow3DRender.java Sun Jan 22 08:05:17 2012
@@ -27,8 +27,7 @@ import org.apache.isis.viewer.dnd.view.w
public class CloseWindow3DRender implements CloseWindowRender {
@Override
- public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled,
- final boolean isOver, final boolean isPressed) {
+ public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled, final boolean isOver, final boolean isPressed) {
final int x = 0;
final int y = 0;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/CustomStyleWindowBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/CustomStyleWindowBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/CustomStyleWindowBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/CustomStyleWindowBorder.java Sun Jan 22 08:05:17 2012
@@ -39,8 +39,7 @@ public class CustomStyleWindowBorder imp
final protected static int LINE_THICKNESS = 5;
private final static Text TITLE_STYLE = Toolkit.getText(ColorsAndFonts.TEXT_TITLE_SMALL);
- int titlebarHeight = Math.max(WindowControl.HEIGHT + View.VPADDING + TITLE_STYLE.getDescent(),
- TITLE_STYLE.getTextHeight());
+ int titlebarHeight = Math.max(WindowControl.HEIGHT + View.VPADDING + TITLE_STYLE.getDescent(), TITLE_STYLE.getTextHeight());
int baseline = LINE_THICKNESS + WindowControl.HEIGHT;
int left = LINE_THICKNESS;
int right = LINE_THICKNESS;
@@ -65,20 +64,14 @@ public class CustomStyleWindowBorder imp
}
@Override
- public void draw(final Canvas canvas, final Size s, final boolean hasFocus, final ViewState state,
- final View[] controls, final String title) {
+ public void draw(final Canvas canvas, final Size s, final boolean hasFocus, final ViewState state, final View[] controls, final String title) {
final int x = left;
final int width = s.getWidth();
final int height = s.getHeight();
- final Color titleBarBackgroundColor =
- hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY3) : Toolkit
- .getColor(ColorsAndFonts.COLOR_SECONDARY3);
- final Color titleBarTextColor =
- hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_BLACK) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1);
- final Color borderColor =
- hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1) : Toolkit
- .getColor(ColorsAndFonts.COLOR_SECONDARY1);
+ final Color titleBarBackgroundColor = hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY3) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3);
+ final Color titleBarTextColor = hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_BLACK) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1);
+ final Color borderColor = hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1);
// slightly rounded grey border
canvas.drawRectangle(1, 0, width - 2, height, borderColor);
@@ -117,8 +110,7 @@ public class CustomStyleWindowBorder imp
final int x = size.getWidth() - 50;
final Image icon = ImageFactory.getInstance().loadIcon("transient", height, null);
if (icon == null) {
- canvas.drawText("*", x, baseline, Toolkit.getColor(ColorsAndFonts.COLOR_BLACK),
- Toolkit.getText(ColorsAndFonts.TEXT_NORMAL));
+ canvas.drawText("*", x, baseline, Toolkit.getColor(ColorsAndFonts.COLOR_BLACK), Toolkit.getText(ColorsAndFonts.TEXT_NORMAL));
} else {
canvas.drawImage(icon, x, LINE_THICKNESS + 1, height, height);
}
@@ -127,9 +119,7 @@ public class CustomStyleWindowBorder imp
@Override
public void getRequiredSize(final Size size, final String title, final View[] controls) {
- final int width =
- left + View.HPADDING + TITLE_STYLE.stringWidth(title) + View.HPADDING + controls.length
- * (WindowControl.WIDTH + View.HPADDING) + View.HPADDING + right;
+ final int width = left + View.HPADDING + TITLE_STYLE.stringWidth(title) + View.HPADDING + controls.length * (WindowControl.WIDTH + View.HPADDING) + View.HPADDING + right;
// size.extendWidth(getLeft() + getRight());
size.ensureWidth(width);
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/IconizeWindow3DRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/IconizeWindow3DRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/IconizeWindow3DRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/IconizeWindow3DRender.java Sun Jan 22 08:05:17 2012
@@ -26,8 +26,7 @@ import org.apache.isis.viewer.dnd.view.w
public class IconizeWindow3DRender implements IconizeWindowRender {
@Override
- public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled,
- final boolean isOver, final boolean isPressed) {
+ public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled, final boolean isOver, final boolean isPressed) {
final int x = 0;
final int y = 0;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/LinuxDatePicker.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/LinuxDatePicker.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/LinuxDatePicker.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/LinuxDatePicker.java Sun Jan 22 08:05:17 2012
@@ -67,8 +67,7 @@ public class LinuxDatePicker extends Abs
private final Calendar today;
private final boolean isEditable;
- String[] monthName = { "January", "February", "March", "April", "May", "June", "July", "August", "September",
- "October", "November", "December" };
+ String[] monthName = { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" };
private Location mouseLocation = new Location(-1, -1);
@@ -165,11 +164,9 @@ public class LinuxDatePicker extends Abs
canvas.drawImage(monthUp, CONTROL_VERTICAL_INSET, CONTROL_HORIZONTAL_INSET);
canvas.drawImage(monthDown, CONTROL_VERTICAL_INSET, CONTROL_HORIZONTAL_INSET + CONTROL_HORIZONTAL_SPACING);
canvas.drawImage(yearUp, CONTROL_VERTICAL_INSET + CONTROL_VERTICAL_SPACING, CONTROL_HORIZONTAL_INSET);
- canvas.drawImage(yearDown, CONTROL_VERTICAL_INSET + CONTROL_VERTICAL_SPACING, CONTROL_HORIZONTAL_INSET
- + CONTROL_HORIZONTAL_SPACING);
+ canvas.drawImage(yearDown, CONTROL_VERTICAL_INSET + CONTROL_VERTICAL_SPACING, CONTROL_HORIZONTAL_INSET + CONTROL_HORIZONTAL_SPACING);
canvas.drawImage(decadeUp, CONTROL_VERTICAL_INSET + (2 * CONTROL_VERTICAL_SPACING), CONTROL_HORIZONTAL_INSET);
- canvas.drawImage(decadeDown, CONTROL_VERTICAL_INSET + (2 * CONTROL_VERTICAL_SPACING), CONTROL_HORIZONTAL_INSET
- + CONTROL_HORIZONTAL_SPACING);
+ canvas.drawImage(decadeDown, CONTROL_VERTICAL_INSET + (2 * CONTROL_VERTICAL_SPACING), CONTROL_HORIZONTAL_INSET + CONTROL_HORIZONTAL_SPACING);
}
@Override
@@ -190,13 +187,10 @@ public class LinuxDatePicker extends Abs
public void firstClick(final Click click) {
final int x = click.getLocation().getX();
final int y = click.getLocation().getY();
- if (y >= CONTROL_HORIZONTAL_INSET + CONTROL_HORIZONTAL_SPACING
- && y <= CONTROL_HORIZONTAL_INSET + (2 * CONTROL_HORIZONTAL_SPACING)) {
- if (x <= CONTROL_VERTICAL_INSET + (3 * CONTROL_VERTICAL_SPACING)
- && x >= CONTROL_VERTICAL_INSET + (2 * CONTROL_VERTICAL_SPACING)) {
+ if (y >= CONTROL_HORIZONTAL_INSET + CONTROL_HORIZONTAL_SPACING && y <= CONTROL_HORIZONTAL_INSET + (2 * CONTROL_HORIZONTAL_SPACING)) {
+ if (x <= CONTROL_VERTICAL_INSET + (3 * CONTROL_VERTICAL_SPACING) && x >= CONTROL_VERTICAL_INSET + (2 * CONTROL_VERTICAL_SPACING)) {
today.add(Calendar.YEAR, -10);
- } else if (x >= CONTROL_VERTICAL_INSET + CONTROL_VERTICAL_SPACING
- && x <= CONTROL_VERTICAL_INSET + (2 * CONTROL_VERTICAL_SPACING)) {
+ } else if (x >= CONTROL_VERTICAL_INSET + CONTROL_VERTICAL_SPACING && x <= CONTROL_VERTICAL_INSET + (2 * CONTROL_VERTICAL_SPACING)) {
today.add(Calendar.YEAR, -1);
} else if (x >= CONTROL_VERTICAL_INSET && x <= CONTROL_VERTICAL_INSET + CONTROL_VERTICAL_SPACING) {
today.add(Calendar.MONTH, -1);
@@ -205,11 +199,9 @@ public class LinuxDatePicker extends Abs
return;
}
if (y > CONTROL_HORIZONTAL_INSET && y <= CONTROL_HORIZONTAL_INSET + CONTROL_HORIZONTAL_SPACING) {
- if (x <= CONTROL_VERTICAL_INSET + (3 * CONTROL_VERTICAL_SPACING)
- && x >= CONTROL_VERTICAL_INSET + (2 * CONTROL_VERTICAL_SPACING)) {
+ if (x <= CONTROL_VERTICAL_INSET + (3 * CONTROL_VERTICAL_SPACING) && x >= CONTROL_VERTICAL_INSET + (2 * CONTROL_VERTICAL_SPACING)) {
today.add(Calendar.YEAR, 10);
- } else if (x >= CONTROL_VERTICAL_INSET + CONTROL_VERTICAL_SPACING
- && x <= CONTROL_VERTICAL_INSET + (2 * CONTROL_VERTICAL_SPACING)) {
+ } else if (x >= CONTROL_VERTICAL_INSET + CONTROL_VERTICAL_SPACING && x <= CONTROL_VERTICAL_INSET + (2 * CONTROL_VERTICAL_SPACING)) {
today.add(Calendar.YEAR, 1);
} else if (x >= CONTROL_VERTICAL_INSET && x <= CONTROL_VERTICAL_INSET + CONTROL_VERTICAL_SPACING) {
today.add(Calendar.MONTH, 1);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/ResizeWindow3DRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/ResizeWindow3DRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/ResizeWindow3DRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/linux/ResizeWindow3DRender.java Sun Jan 22 08:05:17 2012
@@ -26,17 +26,14 @@ import org.apache.isis.viewer.dnd.view.w
public class ResizeWindow3DRender implements ResizeWindowRender {
@Override
- public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled,
- final boolean isOver, final boolean isPressed) {
+ public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled, final boolean isOver, final boolean isPressed) {
final int x = 0;
final int y = 0;
canvas.drawRectangle(x - 1, y, width + 2, height + 1, Toolkit.getColor(ColorsAndFonts.COLOR_WHITE));
canvas.drawRectangle(x, y - 1, width, height + 1, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1));
- canvas.drawSolidRectangle(width / 2 - 1, y + 2, 3, height - 4,
- Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2));
- canvas.drawSolidRectangle(x + 2, height / 2 - 1, width - 4, 3,
- Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2));
+ canvas.drawSolidRectangle(width / 2 - 1, y + 2, 3, height - 4, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2));
+ canvas.drawSolidRectangle(x + 2, height / 2 - 1, width - 4, 3, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2));
}
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/CloseWindowSimpleRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/CloseWindowSimpleRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/CloseWindowSimpleRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/CloseWindowSimpleRender.java Sun Jan 22 08:05:17 2012
@@ -26,8 +26,7 @@ import org.apache.isis.viewer.dnd.view.w
public class CloseWindowSimpleRender extends SimpleRender implements CloseWindowRender {
@Override
- public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled,
- final boolean isOver, final boolean isPressed) {
+ public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled, final boolean isOver, final boolean isPressed) {
final int x = 0;
final int y = 0;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/IconizeWindowSimpleRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/IconizeWindowSimpleRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/IconizeWindowSimpleRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/IconizeWindowSimpleRender.java Sun Jan 22 08:05:17 2012
@@ -26,8 +26,7 @@ import org.apache.isis.viewer.dnd.view.w
public class IconizeWindowSimpleRender extends SimpleRender implements IconizeWindowRender {
@Override
- public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled,
- final boolean isOver, final boolean isPressed) {
+ public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled, final boolean isOver, final boolean isPressed) {
final int x = 0;
final int y = 0;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/ResizeWindowSimpleRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/ResizeWindowSimpleRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/ResizeWindowSimpleRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/ResizeWindowSimpleRender.java Sun Jan 22 08:05:17 2012
@@ -26,8 +26,7 @@ import org.apache.isis.viewer.dnd.view.w
public class ResizeWindowSimpleRender extends SimpleRender implements ResizeWindowRender {
@Override
- public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled,
- final boolean isOver, final boolean isPressed) {
+ public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled, final boolean isOver, final boolean isPressed) {
final int x = 0;
final int y = 0;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleButtonRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleButtonRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleButtonRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleButtonRender.java Sun Jan 22 08:05:17 2012
@@ -37,8 +37,7 @@ public class SimpleButtonRender implemen
}
@Override
- public void draw(final Canvas canvas, final Size size, final boolean isDisabled, final boolean isDefault,
- final boolean hasFocus, final boolean isOver, final boolean isPressed, final String text) {
+ public void draw(final Canvas canvas, final Size size, final boolean isDisabled, final boolean isDefault, final boolean hasFocus, final boolean isOver, final boolean isPressed, final String text) {
final int buttonWidth = TEXT_PADDING + style.stringWidth(text) + TEXT_PADDING;
final Color borderColor;
@@ -58,8 +57,7 @@ public class SimpleButtonRender implemen
@Override
public Size getMaximumSize(final String text) {
- final int buttonWidth =
- TEXT_PADDING + Toolkit.getText(ColorsAndFonts.TEXT_CONTROL).stringWidth(text) + TEXT_PADDING;
+ final int buttonWidth = TEXT_PADDING + Toolkit.getText(ColorsAndFonts.TEXT_CONTROL).stringWidth(text) + TEXT_PADDING;
return new Size(buttonWidth, buttonHeight);
}
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleRender.java Sun Jan 22 08:05:17 2012
@@ -29,8 +29,7 @@ class SimpleRender {
if (isDisabled) {
color = Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3);
} else {
- color =
- isOver ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY2) : Toolkit.getColor(ColorsAndFonts.COLOR_BLACK);
+ color = isOver ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY2) : Toolkit.getColor(ColorsAndFonts.COLOR_BLACK);
}
return color;
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleScrollBarRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleScrollBarRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleScrollBarRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleScrollBarRender.java Sun Jan 22 08:05:17 2012
@@ -27,30 +27,29 @@ import org.apache.isis.viewer.dnd.view.b
public class SimpleScrollBarRender implements ScrollBarRender {
@Override
- public void draw(final Canvas canvas, final boolean isHorizontal, final int x, final int y, final int width,
- final int height, final int scrollPosition, final int visibleAmount) {
+ public void draw(final Canvas canvas, final boolean isHorizontal, final int x, final int y, final int width, final int height, final int scrollPosition, final int visibleAmount) {
// canvas.drawSolidRectangle(x + 1, y + 1, width - 2, height - 2,
// Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
if (isHorizontal) {
- // canvas.drawSolidRectangle(x + scrollPosition, y + 2, visibleAmount, height - 4,
+ // canvas.drawSolidRectangle(x + scrollPosition, y + 2,
+ // visibleAmount, height - 4,
// Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
- // canvas.drawRectangle(x + scrollPosition, y + 1, visibleAmount, height - 2,
+ // canvas.drawRectangle(x + scrollPosition, y + 1, visibleAmount,
+ // height - 2,
// Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2));
- canvas.drawRectangle(x + scrollPosition + 2, y + 2, visibleAmount - 4, height - 4,
- Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2));
- canvas.drawSolidRectangle(x + scrollPosition + 3, y + 3, visibleAmount - 6, height - 6,
- Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
+ canvas.drawRectangle(x + scrollPosition + 2, y + 2, visibleAmount - 4, height - 4, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2));
+ canvas.drawSolidRectangle(x + scrollPosition + 3, y + 3, visibleAmount - 6, height - 6, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
} else {
- // canvas.drawSolidRectangle(x + 2, y + scrollPosition, width - 4, visibleAmount,
+ // canvas.drawSolidRectangle(x + 2, y + scrollPosition, width - 4,
+ // visibleAmount,
// Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
- // canvas.drawRectangle(x + 1, y + scrollPosition, width - 2, visibleAmount,
+ // canvas.drawRectangle(x + 1, y + scrollPosition, width - 2,
+ // visibleAmount,
// Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2));
- canvas.drawRectangle(x + 2, y + scrollPosition + 2, width - 4, visibleAmount - 4,
- Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2));
- canvas.drawSolidRectangle(x + 3, y + scrollPosition + 3, width - 6, visibleAmount - 6,
- Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
+ canvas.drawRectangle(x + 2, y + scrollPosition + 2, width - 4, visibleAmount - 4, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2));
+ canvas.drawSolidRectangle(x + 3, y + scrollPosition + 3, width - 6, visibleAmount - 6, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
}
canvas.drawRectangle(x, y, width, height, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2));
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleStyleWindowBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleStyleWindowBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleStyleWindowBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/simple/SimpleStyleWindowBorder.java Sun Jan 22 08:05:17 2012
@@ -39,8 +39,7 @@ public class SimpleStyleWindowBorder imp
final protected static int LINE_THICKNESS = 4;
private final static Text TITLE_STYLE = Toolkit.getText(ColorsAndFonts.TEXT_TITLE_SMALL);
- int titlebarHeight = Math.max(WindowControl.HEIGHT + View.VPADDING + TITLE_STYLE.getDescent(),
- TITLE_STYLE.getTextHeight());
+ int titlebarHeight = Math.max(WindowControl.HEIGHT + View.VPADDING + TITLE_STYLE.getDescent(), TITLE_STYLE.getTextHeight());
int baseline = LINE_THICKNESS + WindowControl.HEIGHT;
int left = LINE_THICKNESS;
int right = LINE_THICKNESS;
@@ -54,7 +53,8 @@ public class SimpleStyleWindowBorder imp
@Override
public void layoutControls(final Size size, final View[] controls) {
- int x = left + View.HPADDING; // size.getWidth() - right - (WindowControl.WIDTH + View.HPADDING) *
+ int x = left + View.HPADDING; // size.getWidth() - right -
+ // (WindowControl.WIDTH + View.HPADDING) *
// controls.length;
final int y = LINE_THICKNESS + View.VPADDING;
@@ -66,40 +66,36 @@ public class SimpleStyleWindowBorder imp
}
@Override
- public void draw(final Canvas canvas, final Size s, final boolean hasFocus, final ViewState state,
- final View[] controls, final String title) {
+ public void draw(final Canvas canvas, final Size s, final boolean hasFocus, final ViewState state, final View[] controls, final String title) {
final int x = left;
final int width = s.getWidth();
final int height = s.getHeight();
- final Color borderColor =
- hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1) : Toolkit
- .getColor(ColorsAndFonts.COLOR_SECONDARY1);
+ final Color borderColor = hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1);
canvas.drawRoundedRectangle(0, 0, width, height, 8, 8, borderColor);
- canvas.drawRectangle(LINE_THICKNESS - 1, LINE_THICKNESS - 1, width - LINE_THICKNESS * 2 + 2, height
- - LINE_THICKNESS * 2 + 2, borderColor);
+ canvas.drawRectangle(LINE_THICKNESS - 1, LINE_THICKNESS - 1, width - LINE_THICKNESS * 2 + 2, height - LINE_THICKNESS * 2 + 2, borderColor);
- final Color titleBarTextColor =
- hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_BLACK) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1);
- final Color titleBarBackgroundColor =
- hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY3) : Toolkit
- .getColor(ColorsAndFonts.COLOR_SECONDARY3);
+ final Color titleBarTextColor = hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_BLACK) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1);
+ final Color titleBarBackgroundColor = hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY3) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3);
/*
- * final Color insetColorLight = hasFocus ? Toolkit.getColor("primary2") : Toolkit.getColor("secondary2"); final
- * Color insetColorDark = hasFocus ? Toolkit.getColor("black") : Toolkit.getColor("black");
+ * final Color insetColorLight = hasFocus ? Toolkit.getColor("primary2")
+ * : Toolkit.getColor("secondary2"); final Color insetColorDark =
+ * hasFocus ? Toolkit.getColor("black") : Toolkit.getColor("black");
*
*
- * // slightly rounded grey border canvas.drawRectangle(1, 0, width - 2, height, borderColor);
- * canvas.drawRectangle(0, 1, width, height - 2, borderColor);
+ * // slightly rounded grey border canvas.drawRectangle(1, 0, width - 2,
+ * height, borderColor); canvas.drawRectangle(0, 1, width, height - 2,
+ * borderColor);
*
- * for (int i = 2; i < left; i++) { canvas.drawRectangle(i, i, width - 2 * i, height - 2 * i, borderColor); }
+ * for (int i = 2; i < left; i++) { canvas.drawRectangle(i, i, width - 2
+ * * i, height - 2 * i, borderColor); }
*
- * if (state.isActive()) { final int i = left; canvas.drawRectangle(i, top, width - 2 * i, height - 2 * i - top,
+ * if (state.isActive()) { final int i = left; canvas.drawRectangle(i,
+ * top, width - 2 * i, height - 2 * i - top,
* Toolkit.getColor("active")); }
*/
// title bar
- canvas.drawSolidRectangle(left + 1, LINE_THICKNESS + 1, width - LINE_THICKNESS * 2 - 1, titlebarHeight - 1,
- titleBarBackgroundColor);
+ canvas.drawSolidRectangle(left + 1, LINE_THICKNESS + 1, width - LINE_THICKNESS * 2 - 1, titlebarHeight - 1, titleBarBackgroundColor);
final int y = LINE_THICKNESS + titlebarHeight;
canvas.drawLine(LINE_THICKNESS, y, width - LINE_THICKNESS - 1, y, borderColor);
@@ -108,10 +104,12 @@ public class SimpleStyleWindowBorder imp
canvas.drawText(text, x + controlWidth, baseline, titleBarTextColor, TITLE_STYLE);
// canvas.drawRectangle(x, 3, width, 20, titleBarTextColor);
/*
- * final Color white = Toolkit.getColor("white"); final int hatchX = View.HPADDING +
- * TITLE_STYLE.stringWidth(title) + 10; final int hatchWidth = controls[0].getBounds().getX() - hatchX - 10;
- * final int hatchY = LINE_THICKNESS + 2; final int hatchHeight = titlebarHeight - 6;
- * DrawingUtil.drawHatching(canvas, hatchX, hatchY, hatchWidth, hatchHeight, borderColor, white);
+ * final Color white = Toolkit.getColor("white"); final int hatchX =
+ * View.HPADDING + TITLE_STYLE.stringWidth(title) + 10; final int
+ * hatchWidth = controls[0].getBounds().getX() - hatchX - 10; final int
+ * hatchY = LINE_THICKNESS + 2; final int hatchHeight = titlebarHeight -
+ * 6; DrawingUtil.drawHatching(canvas, hatchX, hatchY, hatchWidth,
+ * hatchHeight, borderColor, white);
*/
}
@@ -121,20 +119,18 @@ public class SimpleStyleWindowBorder imp
final int x = size.getWidth() - 50;
final Image icon = ImageFactory.getInstance().loadIcon("transient", height, null);
if (icon == null) {
- canvas.drawText("*", x, baseline, Toolkit.getColor(ColorsAndFonts.COLOR_BLACK),
- Toolkit.getText(ColorsAndFonts.TEXT_NORMAL));
+ canvas.drawText("*", x, baseline, Toolkit.getColor(ColorsAndFonts.COLOR_BLACK), Toolkit.getText(ColorsAndFonts.TEXT_NORMAL));
} else {
canvas.drawImage(icon, x, LINE_THICKNESS + 1, height, height);
- // canvas.drawRectangle(x, LINE_THICKNESS + 1, height, height, Color.RED);
+ // canvas.drawRectangle(x, LINE_THICKNESS + 1, height, height,
+ // Color.RED);
}
}
@Override
public void getRequiredSize(final Size size, final String title, final View[] controls) {
- final int width =
- left + View.HPADDING + TITLE_STYLE.stringWidth(title) + View.HPADDING + controls.length
- * (WindowControl.WIDTH + View.HPADDING) + View.HPADDING + right;
+ final int width = left + View.HPADDING + TITLE_STYLE.stringWidth(title) + View.HPADDING + controls.length * (WindowControl.WIDTH + View.HPADDING) + View.HPADDING + right;
size.ensureWidth(width);
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/Button3DStyleRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/Button3DStyleRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/Button3DStyleRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/Button3DStyleRender.java Sun Jan 22 08:05:17 2012
@@ -37,8 +37,7 @@ public class Button3DStyleRender impleme
}
@Override
- public void draw(final Canvas canvas, final Size size, final boolean isDisabled, final boolean isDefault,
- final boolean hasFocus, final boolean isOver, final boolean isPressed, final String text) {
+ public void draw(final Canvas canvas, final Size size, final boolean isDisabled, final boolean isDefault, final boolean hasFocus, final boolean isOver, final boolean isPressed, final String text) {
final int x = 0;
final int y = 0;
@@ -46,35 +45,23 @@ public class Button3DStyleRender impleme
canvas.drawSolidRectangle(x, y, buttonWidth, buttonHeight, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
- final Color color =
- isDisabled ? Toolkit.getColor(ColorsAndFonts.COLOR_MENU_DISABLED) : Toolkit
- .getColor(ColorsAndFonts.COLOR_BLACK);
- final Color border =
- isDisabled ? Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3) : Toolkit
- .getColor(ColorsAndFonts.COLOR_SECONDARY2);
- canvas.drawRectangle(
- x,
- y,
- buttonWidth,
- buttonHeight,
- isOver & !isDisabled ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1) : Toolkit
- .getColor(ColorsAndFonts.COLOR_BLACK));
+ final Color color = isDisabled ? Toolkit.getColor(ColorsAndFonts.COLOR_MENU_DISABLED) : Toolkit.getColor(ColorsAndFonts.COLOR_BLACK);
+ final Color border = isDisabled ? Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2);
+ canvas.drawRectangle(x, y, buttonWidth, buttonHeight, isOver & !isDisabled ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1) : Toolkit.getColor(ColorsAndFonts.COLOR_BLACK));
canvas.draw3DRectangle(x + 1, y + 1, buttonWidth - 2, buttonHeight - 2, border, !isPressed);
canvas.draw3DRectangle(x + 2, y + 2, buttonWidth - 4, buttonHeight - 4, border, !isPressed);
if (isDefault) {
canvas.drawRectangle(x + 3, y + 3, buttonWidth - 6, buttonHeight - 6, border);
}
if (hasFocus) {
- canvas.drawRectangle(x + 3, y + 3, buttonWidth - 6, buttonHeight - 6,
- Toolkit.getColor(ColorsAndFonts.COLOR_WHITE));
+ canvas.drawRectangle(x + 3, y + 3, buttonWidth - 6, buttonHeight - 6, Toolkit.getColor(ColorsAndFonts.COLOR_WHITE));
}
canvas.drawText(text, x + TEXT_PADDING, y + buttonHeight / 2 + style.getMidPoint(), color, style);
}
@Override
public Size getMaximumSize(final String text) {
- final int buttonWidth =
- TEXT_PADDING + Toolkit.getText(ColorsAndFonts.TEXT_CONTROL).stringWidth(text) + TEXT_PADDING;
+ final int buttonWidth = TEXT_PADDING + Toolkit.getText(ColorsAndFonts.TEXT_CONTROL).stringWidth(text) + TEXT_PADDING;
return new Size(buttonWidth, buttonHeight);
}
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/CloseWindow3DRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/CloseWindow3DRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/CloseWindow3DRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/CloseWindow3DRender.java Sun Jan 22 08:05:17 2012
@@ -28,8 +28,7 @@ import org.apache.isis.viewer.dnd.view.w
public class CloseWindow3DRender implements CloseWindowRender {
@Override
- public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled,
- final boolean isOver, final boolean isPressed) {
+ public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled, final boolean isOver, final boolean isPressed) {
final int x = 0;
final int y = 0;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/IconizeWindow3DRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/IconizeWindow3DRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/IconizeWindow3DRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/IconizeWindow3DRender.java Sun Jan 22 08:05:17 2012
@@ -27,8 +27,7 @@ import org.apache.isis.viewer.dnd.view.w
public class IconizeWindow3DRender implements IconizeWindowRender {
@Override
- public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled,
- final boolean isOver, final boolean isPressed) {
+ public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled, final boolean isOver, final boolean isPressed) {
final int x = 0;
final int y = 0;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/ResizeView3DRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/ResizeView3DRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/ResizeView3DRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/ResizeView3DRender.java Sun Jan 22 08:05:17 2012
@@ -30,9 +30,7 @@ public class ResizeView3DRender implemen
@Override
public void draw(final Canvas canvas, final int x, final int width, final int height, final boolean hasFocus) {
- final Color borderColor =
- hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY3) : Toolkit
- .getColor(ColorsAndFonts.COLOR_SECONDARY3);
+ final Color borderColor = hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY3) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3);
canvas.drawSolidRectangle(x, 0, width, height, borderColor);
final Color secondary2 = Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2);
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/ResizeWindow3DRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/ResizeWindow3DRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/ResizeWindow3DRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/ResizeWindow3DRender.java Sun Jan 22 08:05:17 2012
@@ -27,8 +27,7 @@ import org.apache.isis.viewer.dnd.view.w
public class ResizeWindow3DRender implements ResizeWindowRender {
@Override
- public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled,
- final boolean isOver, final boolean isPressed) {
+ public void draw(final Canvas canvas, final int width, final int height, final boolean isDisabled, final boolean isOver, final boolean isPressed) {
final int x = 0;
final int y = 0;
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/ScrollBar3DRender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/ScrollBar3DRender.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/ScrollBar3DRender.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/ScrollBar3DRender.java Sun Jan 22 08:05:17 2012
@@ -29,8 +29,7 @@ import org.apache.isis.viewer.dnd.view.b
public class ScrollBar3DRender implements ScrollBarRender {
@Override
- public void draw(final Canvas canvas, final boolean isHorizontal, final int x, final int y, final int width,
- final int height, final int scrollPosition, final int visibleAmount) {
+ public void draw(final Canvas canvas, final boolean isHorizontal, final int x, final int y, final int width, final int height, final int scrollPosition, final int visibleAmount) {
final Color thumbColor = Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY2);
// canvas.drawSolidRectangle(x + 1, y + 1, width - 2, height - 2,
@@ -48,10 +47,8 @@ public class ScrollBar3DRender implement
scrollHeight = visibleAmount;
}
canvas.drawSolidRectangle(x2 + 1, y2, scrollWidth - 2, scrollHeight, thumbColor);
- canvas.drawRectangle(x2 + 1, y2, scrollWidth - 2, scrollHeight,
- Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1));
- DrawingUtil.drawHatching(canvas, x2 + 3, y2 + 4, scrollWidth - 6, scrollHeight - 8,
- Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1), Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY3));
+ canvas.drawRectangle(x2 + 1, y2, scrollWidth - 2, scrollHeight, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1));
+ DrawingUtil.drawHatching(canvas, x2 + 3, y2 + 4, scrollWidth - 6, scrollHeight - 8, Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1), Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY3));
canvas.drawRectangle(x, y, width, height, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2));
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/SwingStyleWindowBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/SwingStyleWindowBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/SwingStyleWindowBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/look/swing/SwingStyleWindowBorder.java Sun Jan 22 08:05:17 2012
@@ -40,8 +40,7 @@ public class SwingStyleWindowBorder impl
final protected static int LINE_THICKNESS = 5;
private final static Text TITLE_STYLE = Toolkit.getText(ColorsAndFonts.TEXT_TITLE_SMALL);
- int titlebarHeight = Math.max(WindowControl.HEIGHT + View.VPADDING + TITLE_STYLE.getDescent(),
- TITLE_STYLE.getTextHeight());
+ int titlebarHeight = Math.max(WindowControl.HEIGHT + View.VPADDING + TITLE_STYLE.getDescent(), TITLE_STYLE.getTextHeight());
int baseline = LINE_THICKNESS + WindowControl.HEIGHT;
int left = LINE_THICKNESS;
int right = LINE_THICKNESS;
@@ -66,25 +65,16 @@ public class SwingStyleWindowBorder impl
}
@Override
- public void draw(final Canvas canvas, final Size s, final boolean hasFocus, final ViewState state,
- final View[] controls, final String title) {
+ public void draw(final Canvas canvas, final Size s, final boolean hasFocus, final ViewState state, final View[] controls, final String title) {
final int x = left;
final int width = s.getWidth();
final int height = s.getHeight();
- final Color titleBarBackgroundColor =
- hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY3) : Toolkit
- .getColor(ColorsAndFonts.COLOR_SECONDARY3);
- final Color titleBarTextColor =
- hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_BLACK) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1);
- final Color borderColor =
- hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1) : Toolkit
- .getColor(ColorsAndFonts.COLOR_SECONDARY1);
- final Color insetColorLight =
- hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY2) : Toolkit
- .getColor(ColorsAndFonts.COLOR_SECONDARY2);
- final Color insetColorDark =
- hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_BLACK) : Toolkit.getColor(ColorsAndFonts.COLOR_BLACK);
+ final Color titleBarBackgroundColor = hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY3) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3);
+ final Color titleBarTextColor = hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_BLACK) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1);
+ final Color borderColor = hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY1) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1);
+ final Color insetColorLight = hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY2) : Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY2);
+ final Color insetColorDark = hasFocus ? Toolkit.getColor(ColorsAndFonts.COLOR_BLACK) : Toolkit.getColor(ColorsAndFonts.COLOR_BLACK);
// slightly rounded grey border
canvas.drawRectangle(1, 0, width - 2, height, borderColor);
@@ -139,8 +129,7 @@ public class SwingStyleWindowBorder impl
final int x = size.getWidth() - 50;
final Image icon = ImageFactory.getInstance().loadIcon("transient", height, null);
if (icon == null) {
- canvas.drawText("*", x, baseline, Toolkit.getColor(ColorsAndFonts.COLOR_BLACK),
- Toolkit.getText(ColorsAndFonts.TEXT_NORMAL));
+ canvas.drawText("*", x, baseline, Toolkit.getColor(ColorsAndFonts.COLOR_BLACK), Toolkit.getText(ColorsAndFonts.TEXT_NORMAL));
} else {
canvas.drawImage(icon, x, LINE_THICKNESS + 1, height, height);
}
@@ -149,9 +138,7 @@ public class SwingStyleWindowBorder impl
@Override
public void getRequiredSize(final Size size, final String title, final View[] controls) {
- final int width =
- left + View.HPADDING + TITLE_STYLE.stringWidth(title) + View.HPADDING + controls.length
- * (WindowControl.WIDTH + View.HPADDING) + View.HPADDING + right;
+ final int width = left + View.HPADDING + TITLE_STYLE.stringWidth(title) + View.HPADDING + controls.length * (WindowControl.WIDTH + View.HPADDING) + View.HPADDING + right;
// size.extendWidth(getLeft() + getRight());
size.ensureWidth(width);
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/lookup/OpenDropDownBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/lookup/OpenDropDownBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/lookup/OpenDropDownBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/lookup/OpenDropDownBorder.java Sun Jan 22 08:05:17 2012
@@ -61,9 +61,7 @@ public abstract class OpenDropDownBorder
canvas.drawShape(triangle, x, y, Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY3));
if (over) {
- final Color color =
- over ? Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1) : Toolkit
- .getColor(ColorsAndFonts.COLOR_PRIMARY2);
+ final Color color = over ? Toolkit.getColor(ColorsAndFonts.COLOR_SECONDARY1) : Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY2);
canvas.drawSolidShape(triangle, x, y, color);
}
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/lookup/SelectionListFocusBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/lookup/SelectionListFocusBorder.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/lookup/SelectionListFocusBorder.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/lookup/SelectionListFocusBorder.java Sun Jan 22 08:05:17 2012
@@ -78,7 +78,8 @@ class SelectionListFocusBorder extends A
final View view = axis.getOriginalView();
final View parentView = view.getParent();
- // remember which view has the focus so we can re-establish it later
+ // remember which view has the focus so we can re-establish it
+ // later
final View[] parentsSubviews = parentView.getSubviews();
int index = 0;
for (int j = 0; j < parentsSubviews.length; j++) {