[jboss-svn-commits] JBL Code SVN: r36063 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor: client/decisiontable and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 25 06:36:59 EST 2010
Author: Rikkola
Date: 2010-11-25 06:36:58 -0500 (Thu, 25 Nov 2010)
New Revision: 36063
Added:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/RoundCornersCss.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/RoundedCornersResource.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/css/RoundCorners.css
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelBottom.gif
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelBottomLeftCorner.gif
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelBottomRightCorner.gif
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelLeftSide.gif
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelRightSide.gif
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelTop.gif
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelTopLeftCorner.gif
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelTopRightCorner.gif
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/DecoratedDisclosurePanel.java
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/JBRMSEntryPoint.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/CommentWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MetaDataWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowWrapper.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/LazyStackPanelHeader.ui.xml
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/Guvnor.css
Log:
GUVNOR-1105 : Add round corners
-DisclosurePanels
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/JBRMSEntryPoint.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/JBRMSEntryPoint.java 2010-11-25 09:58:46 UTC (rev 36062)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/JBRMSEntryPoint.java 2010-11-25 11:36:58 UTC (rev 36063)
@@ -20,6 +20,7 @@
import org.drools.guvnor.client.explorer.ExplorerLayoutManager;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.resources.GuvnorResources;
+import org.drools.guvnor.client.resources.RoundedCornersResource;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.rpc.UserSecurityContext;
import org.drools.guvnor.client.ruleeditor.StandaloneEditorManager;
@@ -52,6 +53,7 @@
public void onModuleLoad() {
GuvnorResources.INSTANCE.headerCss().ensureInjected();
+ RoundedCornersResource.INSTANCE.roundCornersCss().ensureInjected();
loggedInUserInfo = new LoggedInUserInfo();
loggedInUserInfo.setVisible( false );
@@ -67,12 +69,12 @@
* If not, the default view (created by ExplorerLayoutManager) is shown.
* @return Guvnor's main view.
*/
- private Panel createMain() {
- if (Window.Location.getPath().contains("StandaloneEditor.html")){
- return (new StandaloneEditorManager().getBaseLayout());
- }
- return (new ExplorerLayoutManager(loggedInUserInfo)).getBaseLayout();
- }
+ private Panel createMain() {
+ if ( Window.Location.getPath().contains( "StandaloneEditor.html" ) ) {
+ return (new StandaloneEditorManager().getBaseLayout());
+ }
+ return (new ExplorerLayoutManager( loggedInUserInfo )).getBaseLayout();
+ }
/**
* Check if user is logged in, if not, then show prompt.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java 2010-11-25 09:58:46 UTC (rev 36062)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java 2010-11-25 11:36:58 UTC (rev 36063)
@@ -38,6 +38,7 @@
import org.drools.guvnor.client.ruleeditor.RuleViewer;
import org.drools.guvnor.client.ruleeditor.SaveEventListener;
import org.drools.guvnor.client.util.AddButton;
+import org.drools.guvnor.client.util.DecoratedDisclosurePanel;
import org.drools.guvnor.client.util.Format;
import org.drools.guvnor.client.util.NumbericFilterKeyPressHandler;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
@@ -64,7 +65,6 @@
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.CheckBox;
import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.DisclosurePanel;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
@@ -112,8 +112,8 @@
implements
SaveEventListener {
- private Constants constants = ((Constants) GWT.create( Constants.class ));
- private static Images images = (Images) GWT.create( Images.class );
+ private Constants constants = GWT.create( Constants.class );
+ private static Images images = GWT.create( Images.class );
private GuidedDecisionTable guidedDecisionTable;
private VerticalPanel layout;
@@ -143,8 +143,7 @@
layout = new VerticalPanel();
- DisclosurePanel disclosurePanel = new DisclosurePanel( constants.DecisionTable() );
- disclosurePanel.setAnimationEnabled( true );
+ DecoratedDisclosurePanel disclosurePanel = new DecoratedDisclosurePanel( constants.DecisionTable() );
disclosurePanel.setWidth( "100%" );
disclosurePanel.setTitle( constants.DecisionTable() );
@@ -334,7 +333,7 @@
private Widget removeAction(final ActionCol c) {
Image del = new ImageButton( images.deleteItemSmall(),
constants.RemoveThisActionColumn(),
- new ClickHandler() {
+ new ClickHandler() {
public void onClick(ClickEvent w) {
String cm = Format.format( constants.DeleteActionColumnWarning(),
c.getHeader() );
Added: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/RoundCornersCss.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/RoundCornersCss.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/RoundCornersCss.java 2010-11-25 11:36:58 UTC (rev 36063)
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2010 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.drools.guvnor.client.resources;
+
+import com.google.gwt.resources.client.CssResource;
+
+/**
+ *
+ * @author rikkola
+ *
+ */
+public interface RoundCornersCss
+ extends
+ CssResource {
+
+ @ClassName("disclosurePanelTopLeftCornerClass")
+ String disclosurePanelTopLeftCornerClass();
+
+ @ClassName("disclosurePanelTopRightCornerClass")
+ String disclosurePanelTopRightCornerClass();
+
+ @ClassName("disclosurePanelBottomLeftCornerClass")
+ String disclosurePanelBottomLeftCornerClass();
+
+ @ClassName("disclosurePanelBottomRightCornerClass")
+ String disclosurePanelBottomRightCornerClass();
+
+ @ClassName("disclosurePanelBottomClass")
+ String disclosurePanelBottomClass();
+
+ @ClassName("disclosurePanelTopClass")
+ String disclosurePanelTopClass();
+
+ @ClassName("disclosurePanelSideLeftClass")
+ String disclosurePanelSideLeftClass();
+
+ @ClassName("disclosurePanelSideRightClass")
+ String disclosurePanelSideRightClass();
+
+ @ClassName("disclosurePanelCenterClass")
+ String disclosurePanelCenterClass();
+
+}
Added: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/RoundedCornersResource.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/RoundedCornersResource.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/RoundedCornersResource.java 2010-11-25 11:36:58 UTC (rev 36063)
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.drools.guvnor.client.resources;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.ImageResource;
+import com.google.gwt.resources.client.ImageResource.ImageOptions;
+import com.google.gwt.resources.client.ImageResource.RepeatStyle;
+
+/**
+ *
+ * @author rikkola
+ *
+ */
+public interface RoundedCornersResource
+ extends
+ ClientBundle {
+
+ RoundedCornersResource INSTANCE = GWT.create( RoundedCornersResource.class );
+
+ @Source("images/corners/disclosurePanelTopLeftCorner.gif")
+ ImageResource disclosurePanelTopLeftCorner();
+
+ @Source("images/corners/disclosurePanelTopRightCorner.gif")
+ ImageResource disclosurePanelTopRightCorner();
+
+ @Source("images/corners/disclosurePanelBottomLeftCorner.gif")
+ ImageResource disclosurePanelBottomLeftCorner();
+
+ @Source("images/corners/disclosurePanelBottomRightCorner.gif")
+ ImageResource disclosurePanelBottomRightCorner();
+
+ @ImageOptions(repeatStyle = RepeatStyle.Horizontal)
+ @Source("images/corners/disclosurePanelBottom.gif")
+ ImageResource disclosurePanelBottom();
+
+ @ImageOptions(flipRtl = true, repeatStyle = RepeatStyle.Horizontal)
+ @Source("images/corners/disclosurePanelTop.gif")
+ ImageResource disclosurePanelTop();
+
+ @ImageOptions(repeatStyle = RepeatStyle.Vertical)
+ @Source("images/corners/disclosurePanelLeftSide.gif")
+ ImageResource disclosurePanelSideLeft();
+
+ @ImageOptions(repeatStyle = RepeatStyle.Vertical)
+ @Source("images/corners/disclosurePanelRightSide.gif")
+ ImageResource disclosurePanelSideRight();
+
+ @Source("css/RoundCorners.css")
+ RoundCornersCss roundCornersCss();
+
+}
Added: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/css/RoundCorners.css
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/css/RoundCorners.css (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/css/RoundCorners.css 2010-11-25 11:36:58 UTC (rev 36063)
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2010 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ at sprite .disclosurePanelTopLeftCornerClass {
+ gwt-image: 'disclosurePanelTopLeftCorner';
+ height: 4px;
+ width: 4px;
+}
+
+ at sprite .disclosurePanelTopRightCornerClass {
+ gwt-image: 'disclosurePanelTopRightCorner';
+ height: 4px;
+ width: 4px;
+}
+
+ at sprite .disclosurePanelBottomLeftCornerClass {
+ gwt-image: 'disclosurePanelBottomLeftCorner';
+ height: 4px;
+ width: 4px;
+}
+
+ at sprite .disclosurePanelBottomRightCornerClass {
+ gwt-image: 'disclosurePanelBottomRightCorner';
+ height: 4px;
+ width: 4px;
+}
+
+ at sprite .disclosurePanelBottomClass {
+ gwt-image: 'disclosurePanelBottom';
+ height: 4px;
+ width: 100%;
+}
+
+ at sprite .disclosurePanelTopClass {
+ gwt-image: 'disclosurePanelTop';
+ height: 4px;
+ width: 100%;
+}
+
+ at sprite .disclosurePanelSideLeftClass {
+ gwt-image: 'disclosurePanelSideLeft';
+ height: 100%;
+ width: 4px;
+ background-color: red;
+}
+
+ at sprite .disclosurePanelSideRightClass {
+ gwt-image: 'disclosurePanelSideRight';
+ height: 100%;
+ width: 4px;
+ background-color: red;
+}
+
+.disclosurePanelCenterClass {
+ background: #E3E3E3;
+}
\ No newline at end of file
Added: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelBottom.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelBottom.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelBottomLeftCorner.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelBottomLeftCorner.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelBottomRightCorner.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelBottomRightCorner.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelLeftSide.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelLeftSide.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelRightSide.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelRightSide.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelTop.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelTop.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelTopLeftCorner.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelTopLeftCorner.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelTopRightCorner.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/resources/images/corners/disclosurePanelTopRightCorner.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/CommentWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/CommentWidget.java 2010-11-25 09:58:46 UTC (rev 36062)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/CommentWidget.java 2010-11-25 11:36:58 UTC (rev 36063)
@@ -18,6 +18,7 @@
import org.drools.guvnor.client.common.DirtyableComposite;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.rpc.MetaData;
+import org.drools.guvnor.client.util.DecoratedDisclosurePanel;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ChangeEvent;
@@ -34,10 +35,10 @@
*/
public class CommentWidget extends DirtyableComposite {
- private Constants constants = ((Constants) GWT.create( Constants.class ));
+ private Constants constants = GWT.create( Constants.class );
- private final TextArea text;
- private final DisclosurePanel disclosurePanel;
+ private final TextArea text;
+ private final DecoratedDisclosurePanel disclosurePanel;
public CommentWidget(final MetaData data) {
text = getTextArea();
@@ -59,9 +60,8 @@
}
- private DisclosurePanel getDisclosurePanel() {
- DisclosurePanel disclosurePanel = new DisclosurePanel( constants.Description() );
- disclosurePanel.setAnimationEnabled( true );
+ private DecoratedDisclosurePanel getDisclosurePanel() {
+ DecoratedDisclosurePanel disclosurePanel = new DecoratedDisclosurePanel( constants.Description() );
disclosurePanel.setWidth( "100%" );
return disclosurePanel;
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java 2010-11-25 09:58:46 UTC (rev 36062)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java 2010-11-25 11:36:58 UTC (rev 36063)
@@ -32,6 +32,7 @@
import org.drools.guvnor.client.rpc.ServerPushNotification;
import org.drools.guvnor.client.security.Capabilities;
import org.drools.guvnor.client.security.CapabilitiesManager;
+import org.drools.guvnor.client.util.DecoratedDisclosurePanel;
import org.drools.guvnor.client.util.Format;
import org.drools.guvnor.client.util.Util;
@@ -42,7 +43,6 @@
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.DisclosurePanel;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
@@ -78,8 +78,7 @@
public DiscussionWidget(final RuleAsset asset) {
this.asset = asset;
- DisclosurePanel discussionPanel = new DisclosurePanel( constants.Discussion() );
- discussionPanel.setAnimationEnabled( true );
+ DecoratedDisclosurePanel discussionPanel = new DecoratedDisclosurePanel( constants.Discussion() );
discussionPanel.setWidth( "100%" );
commentList.setWidth( "100%" );
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MetaDataWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MetaDataWidget.java 2010-11-25 09:58:46 UTC (rev 36062)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MetaDataWidget.java 2010-11-25 11:36:58 UTC (rev 36063)
@@ -31,7 +31,9 @@
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.security.Capabilities;
import org.drools.guvnor.client.security.CapabilitiesManager;
+import org.drools.guvnor.client.util.DecoratedDisclosurePanel;
import org.drools.guvnor.client.util.Format;
+import org.drools.guvnor.client.util.LazyStackPanelHeader;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ChangeEvent;
@@ -274,8 +276,7 @@
}
private void endSection(boolean collapsed) {
- DisclosurePanel advancedDisclosure = new DisclosurePanel( currentSectionName );
- advancedDisclosure.setAnimationEnabled( true );
+ DecoratedDisclosurePanel advancedDisclosure = new DecoratedDisclosurePanel( currentSectionName );
advancedDisclosure.setWidth( "100%" );
advancedDisclosure.setOpen( collapsed );
advancedDisclosure.setContent( this.currentSection );
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowWrapper.java 2010-11-25 09:58:46 UTC (rev 36062)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowWrapper.java 2010-11-25 11:36:58 UTC (rev 36063)
@@ -20,23 +20,23 @@
import org.drools.guvnor.client.common.FormStyleLayout;
import org.drools.guvnor.client.common.FormStylePopup;
import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.explorer.Preferences;
+import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.resources.Images;
import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.rpc.RuleFlowContentModel;
import org.drools.guvnor.client.rulefloweditor.RuleFlowViewer;
-import org.drools.guvnor.client.explorer.Preferences;
-import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.util.DecoratedDisclosurePanel;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.DisclosurePanel;
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
/**
*
@@ -48,14 +48,14 @@
implements
SaveEventListener {
- private Constants constants = GWT.create( Constants.class );
- private static Images images = GWT.create( Images.class );
+ private Constants constants = GWT.create( Constants.class );
+ private static Images images = GWT.create( Images.class );
- private RuleViewer viewer;
- private RuleAsset asset;
+ private RuleViewer viewer;
+ private RuleAsset asset;
- private RuleFlowViewer ruleFlowViewer;
- private DisclosurePanel parameterPanel;
+ private RuleFlowViewer ruleFlowViewer;
+ private DecoratedDisclosurePanel parameterPanel;
public RuleFlowWrapper(final RuleAsset asset,
final RuleViewer viewer) {
@@ -121,8 +121,7 @@
if ( rfcm != null && rfcm.getXml() != null && rfcm.getNodes() != null ) {
try {
- parameterPanel = new DisclosurePanel( constants.Parameters() );
- parameterPanel.setAnimationEnabled( true );
+ parameterPanel = new DecoratedDisclosurePanel( constants.Parameters() );
parameterPanel.ensureDebugId( "cwDisclosurePanel" );
parameterPanel.setWidth( "100%" );
parameterPanel.setOpen( false );
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java 2010-11-25 09:58:46 UTC (rev 36062)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java 2010-11-25 11:36:58 UTC (rev 36063)
@@ -26,20 +26,13 @@
import org.drools.guvnor.client.common.GenericCallback;
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.explorer.Preferences;
+import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.modeldriven.ui.DatePickerTextBox;
import org.drools.guvnor.client.rpc.MetaDataQuery;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.util.DecoratedDisclosurePanel;
import org.drools.guvnor.client.util.Format;
-import org.drools.guvnor.client.messages.Constants;
-import org.drools.guvnor.client.modeldriven.ui.DatePickerTextBox;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.DisclosurePanel;
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.gwt.user.client.ui.TextBox;
-import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler;
@@ -48,8 +41,14 @@
import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.event.dom.client.KeyPressEvent;
import com.google.gwt.event.dom.client.KeyPressHandler;
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.SimplePanel;
+import com.google.gwt.user.client.ui.TextBox;
+import com.google.gwt.user.client.ui.VerticalPanel;
-
public class QueryWidget extends Composite {
private VerticalPanel layout;
@@ -69,11 +68,9 @@
}
private void doMetaSearch() {
- DisclosurePanel advancedDisclosure = new DisclosurePanel(
- constants.AttributeSearch());
- advancedDisclosure.setAnimationEnabled(true);
- advancedDisclosure.setWidth("100%");
- advancedDisclosure.setOpen(true);
+ DecoratedDisclosurePanel advancedDisclosure = new DecoratedDisclosurePanel( constants.AttributeSearch() );
+ advancedDisclosure.setWidth( "100%" );
+ advancedDisclosure.setOpen( true );
final Map<String, MetaDataQuery> atts = new HashMap<String, MetaDataQuery>() {
private static final long serialVersionUID = 510l;
@@ -108,10 +105,10 @@
box.setTitle( constants.WildCardsSearchTip() );
fm.addAttribute( fieldName + ":",
box );
- box.addChangeHandler(new ChangeHandler() {
- public void onChange(ChangeEvent arg0) {
- q.valueList = box.getText();
- }
+ box.addChangeHandler( new ChangeHandler() {
+ public void onChange(ChangeEvent arg0) {
+ q.valueList = box.getText();
+ }
} );
}
@@ -147,7 +144,7 @@
Button search = new Button( constants.Search() );
fm.addAttribute( "",
search );
- search.addClickHandler(new ClickHandler() {
+ search.addClickHandler( new ClickHandler() {
public void onClick(ClickEvent arg0) {
resultsP.clear();
AssetItemGrid grid = new AssetItemGrid( openItem,
@@ -192,31 +189,25 @@
}
} );
fm.addRow( resultsP );
- advancedDisclosure.setContent(fm);
-
- layout.add(advancedDisclosure);
+ advancedDisclosure.setContent( fm );
+
+ layout.add( advancedDisclosure );
}
private void doQuickFind() {
- DisclosurePanel advancedDisclosure = new DisclosurePanel(
- constants.NameSearch());
- advancedDisclosure.setAnimationEnabled(true);
- advancedDisclosure.ensureDebugId("cwDisclosurePanel");
- advancedDisclosure.addStyleName("my-DisclosurePanel");
- advancedDisclosure.setWidth("100%");
- advancedDisclosure.setContent(new QuickFindWidget(openItem));
- advancedDisclosure.setOpen(true);
+ DecoratedDisclosurePanel advancedDisclosure = new DecoratedDisclosurePanel( constants.NameSearch() );
+ advancedDisclosure.ensureDebugId( "cwDisclosurePanel" );
+ advancedDisclosure.setWidth( "100%" );
+ advancedDisclosure.setContent( new QuickFindWidget( openItem ) );
+ advancedDisclosure.setOpen( true );
layout.add( advancedDisclosure );
}
private void doTextSearch() {
- DisclosurePanel advancedDisclosure = new DisclosurePanel(
- constants.TextSearch());
- advancedDisclosure.setAnimationEnabled(true);
- advancedDisclosure.addStyleName("my-DisclosurePanel");
- advancedDisclosure.setWidth("100%");
- advancedDisclosure.setOpen(true);
+ DecoratedDisclosurePanel advancedDisclosure = new DecoratedDisclosurePanel( constants.TextSearch() );
+ advancedDisclosure.setWidth( "100%" );
+ advancedDisclosure.setOpen( true );
FormStyleLayout ts = new FormStyleLayout();
final TextBox tx = new TextBox();
@@ -227,12 +218,11 @@
ts.addAttribute( "",
go );
ts.setWidth( "100%" );
- advancedDisclosure.setContent(ts);
-
+ advancedDisclosure.setContent( ts );
+
final SimplePanel resultsP = new SimplePanel();
final ClickHandler cl = new ClickHandler() {
-
-
+
public void onClick(ClickEvent arg0) {
if ( tx.getText().equals( "" ) ) {
Window.alert( constants.PleaseEnterSomeSearchText() );
@@ -257,17 +247,16 @@
};
- go.addClickHandler(cl);
- tx.addKeyPressHandler(new KeyPressHandler() {
+ go.addClickHandler( cl );
+ tx.addKeyPressHandler( new KeyPressHandler() {
public void onKeyPress(KeyPressEvent event) {
- if (event.getCharCode() == KeyCodes.KEY_ENTER) {
+ if ( event.getCharCode() == KeyCodes.KEY_ENTER ) {
cl.onClick( null );
}
- }
- });
+ }
+ } );
ts.addRow( resultsP );
layout.add( advancedDisclosure );
}
-
}
Added: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/DecoratedDisclosurePanel.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/DecoratedDisclosurePanel.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/DecoratedDisclosurePanel.java 2010-11-25 11:36:58 UTC (rev 36063)
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2010 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.drools.guvnor.client.util;
+
+import java.util.Iterator;
+
+import com.google.gwt.event.logical.shared.CloseEvent;
+import com.google.gwt.event.logical.shared.CloseHandler;
+import com.google.gwt.event.logical.shared.HasCloseHandlers;
+import com.google.gwt.event.logical.shared.HasOpenHandlers;
+import com.google.gwt.event.logical.shared.OpenEvent;
+import com.google.gwt.event.logical.shared.OpenHandler;
+import com.google.gwt.event.shared.HandlerRegistration;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.DisclosurePanel;
+import com.google.gwt.user.client.ui.HasWidgets;
+import com.google.gwt.user.client.ui.Widget;
+
+/**
+ * Disclosure panel with rounded corners in header.
+ *
+ * Using this class we don't need to set the header and event handlers for the header everywhere we use DisclosurePanels.
+ *
+ * @author rikkola
+ *
+ */
+public class DecoratedDisclosurePanel extends Composite
+ implements
+ HasWidgets,
+ HasOpenHandlers<DisclosurePanel>,
+ HasCloseHandlers<DisclosurePanel> {
+
+ private final DisclosurePanel widget = new DisclosurePanel();
+
+ public DecoratedDisclosurePanel(String headerText) {
+
+ widget.setAnimationEnabled( true );
+ widget.setHeader( createHeader( headerText ) );
+
+ initWidget( widget );
+ }
+
+ private LazyStackPanelHeader createHeader(String headerText) {
+ final LazyStackPanelHeader header = new LazyStackPanelHeader( headerText );
+
+ widget.addOpenHandler( new OpenHandler<DisclosurePanel>() {
+ public void onOpen(OpenEvent<DisclosurePanel> event) {
+ header.expand();
+ }
+ } );
+ widget.addCloseHandler( new CloseHandler<DisclosurePanel>() {
+ public void onClose(CloseEvent<DisclosurePanel> event) {
+ header.collapse();
+ }
+ } );
+
+ return header;
+ }
+
+ public void add(Widget w) {
+ widget.add( w );
+ }
+
+ public void setContent(Widget content) {
+ widget.setContent( content );
+ }
+
+ public HandlerRegistration addOpenHandler(OpenHandler<DisclosurePanel> openHandler) {
+ return widget.addOpenHandler( openHandler );
+ }
+
+ public HandlerRegistration addCloseHandler(CloseHandler<DisclosurePanel> handler) {
+ return widget.addCloseHandler( handler );
+ }
+
+ public void clear() {
+ widget.clear();
+ }
+
+ public Iterator<Widget> iterator() {
+ return widget.iterator();
+ }
+
+ public boolean remove(Widget w) {
+ return widget.remove( w );
+ }
+
+ public void setOpen(boolean b) {
+ widget.setOpen( b );
+ }
+
+ public boolean isOpen() {
+ return widget.isOpen();
+ }
+}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/LazyStackPanelHeader.ui.xml
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/LazyStackPanelHeader.ui.xml 2010-11-25 09:58:46 UTC (rev 36062)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/LazyStackPanelHeader.ui.xml 2010-11-25 11:36:58 UTC (rev 36063)
@@ -17,13 +17,33 @@
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:gwt='urn:import:com.google.gwt.user.client.ui' xmlns:guvnor='urn:import:org.drools.guvnor.client.common'>
+ <ui:with field='roundCornersResource' type='org.drools.guvnor.client.resources.RoundedCornersResource'/>
+
<gwt:HTMLPanel>
- <div >
- <gwt:HorizontalPanel >
- <gwt:Image ui:field="icon" styleName="guvnor-LazyStackPanel-row-header-icon"></gwt:Image>
- <gwt:Label ui:field="titleLabel" styleName="guvnor-cursor"></gwt:Label>
- </gwt:HorizontalPanel>
- </div>
+ <table style='width:100%; border-collapse:collapse;'>
+ <tr>
+ <td style='width:4px;'><div class='{roundCornersResource.roundCornersCss.disclosurePanelTopLeftCornerClass}'></div></td>
+ <td><div class='{roundCornersResource.roundCornersCss.disclosurePanelTopClass}'></div></td>
+ <td style='width:4px;'><div class='{roundCornersResource.roundCornersCss.disclosurePanelTopRightCornerClass}'></div></td>
+ </tr>
+
+ <tr>
+ <td class='{roundCornersResource.roundCornersCss.disclosurePanelSideLeftClass}'></td>
+ <td class='{roundCornersResource.roundCornersCss.disclosurePanelCenterClass}'>
+ <gwt:HorizontalPanel >
+ <gwt:Image ui:field="icon" styleName="guvnor-LazyStackPanel-row-header-icon"></gwt:Image>
+ <gwt:Label ui:field="titleLabel" styleName="guvnor-cursor"></gwt:Label>
+ </gwt:HorizontalPanel>
+ </td>
+ <td class='{roundCornersResource.roundCornersCss.disclosurePanelSideRightClass}'></td>
+ </tr>
+
+ <tr>
+ <td style='width:4px;'><div class='{roundCornersResource.roundCornersCss.disclosurePanelBottomLeftCornerClass}'></div></td>
+ <td><div class='{roundCornersResource.roundCornersCss.disclosurePanelBottomClass}'></div></td>
+ <td style='width:4px;'><div class='{roundCornersResource.roundCornersCss.disclosurePanelBottomRightCornerClass}'></div></td>
+ </tr>
+ </table>
</gwt:HTMLPanel>
</ui:UiBinder>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/Guvnor.css
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/Guvnor.css 2010-11-25 09:58:46 UTC (rev 36062)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/Guvnor.css 2010-11-25 11:36:58 UTC (rev 36063)
@@ -30,18 +30,6 @@
border: 0;
}
-.gwt-DisclosurePanel .header {
- border: 1px solid #BBBBBB;
- background: #E3E3E3;
- padding-bottom: 2px;
- width: 100%;
- height: 20px;
- text-decoration: none; /* Remove underline from header */
- color: white;
- cursor: pointer;
- cursor: hand;
-}
-
.gwt-DisclosurePanel .content {
border-left: 3px solid #e3e3e3;
padding: 4px 0px 4px 8px;
More information about the jboss-svn-commits
mailing list