[kune-commits] r1020 - in trunk: .
src/main/java/org/ourproject/kune/platf/client/ui/dialogs
src/main/java/org/ourproject/kune/workspace/client
src/main/java/org/ourproject/kune/workspace/client/ctxnav
src/main/java/org/ourproject/kune/workspace/client/licensefoot
src/main/java/org/ourproject/kune/workspace/client/skel
vjrj
vjrj at ourproject.org
Fri Jan 2 01:58:55 CET 2009
Author: vjrj
Date: 2009-01-02 01:58:53 +0100 (Fri, 02 Jan 2009)
New Revision: 1020
Removed:
trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicDialogGxt.java
Modified:
trunk/pom.xml
trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java
Log:
minor bug fixes
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-01-01 22:02:17 UTC (rev 1019)
+++ trunk/pom.xml 2009-01-02 00:58:53 UTC (rev 1020)
@@ -368,10 +368,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
+ <!-- Uncomment and run mvn with -X -e if we have same compile problems
+ <compilerArgument>-verbose</compilerArgument>
+ <fork>true</fork>
+ <verbose>true</verbose>
+ -->
</configuration>
</plugin>
<plugin>
@@ -380,7 +384,7 @@
<version>2.0-beta26</version>
<configuration>
<logLevel>INFO</logLevel>
- <style>PRETTY</style>
+ <style>OBF</style>
<!-- <style>OBF PRETTY</style> -->
<runTarget>
org.ourproject.kune.app.Kune/Kune.html
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicDialogGxt.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicDialogGxt.java 2009-01-01 22:02:17 UTC (rev 1019)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicDialogGxt.java 2009-01-02 00:58:53 UTC (rev 1020)
@@ -1,66 +0,0 @@
-/*
- *
- * Copyright (C) 2007-2008 The kune development team (see CREDITS for details)
- * This file is part of kune.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.ourproject.kune.platf.client.ui.dialogs;
-
-// import com.extjs.gxt.ui.client.Style.HorizontalAlignment;
-// import com.extjs.gxt.ui.client.Style.Scroll;
-// import com.extjs.gxt.ui.client.widget.Window;
-//
-// public class BasicDialogGxt extends Window {
-//
-// public BasicDialogGxt(final String caption, final boolean modal) {
-// this(caption, modal, Scroll.AUTO);
-// }
-//
-// public BasicDialogGxt(final String caption, final boolean modal, final Scroll
-// scroll) {
-// setAutoWidth(true);
-// // Param values
-// setTitle(caption);
-// setModal(modal);
-// setScrollMode(scroll);
-// // Def values
-// setShadow(true);
-// setPlain(true);
-// setClosable(true);
-// setCollapsible(true);
-// setResizable(true);
-// setButtonAlign(HorizontalAlignment.RIGHT);
-// }
-//
-// public BasicDialogGxt(final String caption, final boolean modal, final Scroll
-// scroll, final int width,
-// final int height) {
-// this(caption, modal, scroll, width, height, width, height);
-// }
-//
-// public BasicDialogGxt(final String caption, final boolean modal, final Scroll
-// scroll, final int width,
-// final int height, final int minWidth, final int minHeight) {
-// this(caption, modal, scroll);
-// setAutoWidth(false);
-// // Param values
-// setWidth(width);
-// setHeight(height);
-// setMinWidth(minWidth);
-// setMinHeight(minHeight);
-// }
-//
-// }
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2009-01-01 22:02:17 UTC (rev 1019)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2009-01-02 00:58:53 UTC (rev 1020)
@@ -248,6 +248,7 @@
contextPropEditorProvider.get().detach();
contextNavigator.attach();
if (session.getCurrentStateToken().equals(stateToken)) {
+ contextNavigator.refreshState();
foldableContent.refreshState();
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java 2009-01-01 22:02:17 UTC (rev 1019)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java 2009-01-02 00:58:53 UTC (rev 1020)
@@ -38,6 +38,8 @@
boolean isSelected(StateToken stateToken);
+ void refreshState();
+
void selectItem(StateToken stateToken);
void setEditOnNextStateChange(boolean edit);
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2009-01-01 22:02:17 UTC (rev 1019)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2009-01-02 00:58:53 UTC (rev 1020)
@@ -33,6 +33,7 @@
import org.ourproject.kune.platf.client.dto.ContainerSimpleDTO;
import org.ourproject.kune.platf.client.dto.ContentSimpleDTO;
import org.ourproject.kune.platf.client.dto.ContentStatusDTO;
+import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
import org.ourproject.kune.platf.client.dto.StateContainerDTO;
import org.ourproject.kune.platf.client.dto.StateContentDTO;
import org.ourproject.kune.platf.client.dto.StateToken;
@@ -102,7 +103,6 @@
// FIXME At the moment detach (removeFromParent) destroy the gwt-ext
// TreePanel and the widget must be recreated (cannot be attached again
// like in gwt)
- // setState(session.getCurrentState(), true);
toolbar.attach();
}
@@ -147,6 +147,13 @@
return editOnNextStateChange;
}
+ public void refreshState() {
+ StateAbstractDTO currentState = session.getCurrentState();
+ if (currentState instanceof StateContainerDTO) {
+ setState((StateContainerDTO) currentState, true);
+ }
+ }
+
public void selectItem(final StateToken stateToken) {
view.selectItem(genId(stateToken));
toolbar.disableMenusAndClearButtons();
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java 2009-01-01 22:02:17 UTC (rev 1019)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java 2009-01-02 00:58:53 UTC (rev 1020)
@@ -35,11 +35,13 @@
import com.gwtext.client.core.ExtElement;
public class EntityLicensePanel implements EntityLicenseView {
+ public static final String LICENSE_LABEL = "k-elp-lic-lab";
private final Image licenseImage;
private final Label licenseLabel;
private final I18nTranslationService i18n;
private final SimpleToolbar licenseBar;
private final WorkspaceSkeleton ws;
+ private final ExtElement labelElement;
public EntityLicensePanel(final EntityLicensePresenter presenter, final I18nTranslationService i18n,
final WorkspaceSkeleton ws) {
@@ -80,16 +82,15 @@
licenseLabel.setStyleName("k-elp-limg");
licenseImage.setStyleName("k-elp-limg");
ws.getEntityWorkspace().getBottomTitle().add(licenseBar);
+ labelElement = Ext.get(licenseLabel.getElement());
}
public void attach() {
licenseBar.setVisible(true);
- // Ext.get(licenseBar.getElement()).setOpacity(1, false);
}
public void detach() {
licenseBar.setVisible(false);
- // Ext.get(licenseBar.getElement()).setOpacity(0, false);
}
public void openWindow(final String url) {
@@ -105,8 +106,7 @@
}
private void fade(final boolean in) {
- ExtElement element = Ext.get(licenseLabel.getElement());
- element.setOpacity(in ? 1 : 0, true);
+ labelElement.setOpacity(in ? 1 : 0, true);
ws.getEntityWorkspace().refreshBottomTitle();
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2009-01-01 22:02:17 UTC (rev 1019)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2009-01-02 00:58:53 UTC (rev 1020)
@@ -93,13 +93,11 @@
panel.addListener(new ContainerListenerAdapter() {
@Override
public void onHide(Component component) {
- super.onHide(component);
openFirstIfActiveNotVisible();
}
@Override
public void onShow(Component component) {
- super.onShow(component);
openFirstIfActiveNotVisible();
}
More information about the kune-commits
mailing list