modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java | 2 - modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDeployment.java | 2 - modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDestination.java | 3 + modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java | 2 - modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 2 - modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java | 2 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 20 +++++++++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackForm.java | 6 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java | 11 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 13 ++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java | 1 11 files changed, 54 insertions(+), 10 deletions(-)
New commits: commit ebf15313f235a0d1cc6c141a004005cb5182df48 Author: Greg Hinkle ghinkle@redhat.com Date: Tue May 25 16:52:29 2010 -0400
minor tweaks
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java index 22f911a..6d4a3fd 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java @@ -27,9 +27,27 @@ package org.rhq.enterprise.gui.coregui.client; */ public class LinkManager {
+ private static boolean GWT = true; +
public static String getResourceLink(int resourceId) {
- return "Resource/" + resourceId; + if (GWT) { + return "Resource/" + resourceId; + } else { + return "/rhq/resource/summary/overview.xhtml?id=" + resourceId; + } } + + + public static String getResourceGroupLink(int resouceGroupId) { + + if (GWT) { + return "ResourceGroup/" + resouceGroupId; + } else { + return "/rhq/group/inventory/view.xhtml?groupId=" + resouceGroupId; + } + } + + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java index c80b21d..0543eac 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java @@ -22,6 +22,7 @@ import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.user.client.History; import com.google.gwt.user.client.ui.Hyperlink; +import com.smartgwt.client.types.ContentsType; import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.HTMLFlow; import com.smartgwt.client.widgets.Img; @@ -67,7 +68,17 @@ public class MenuBarView extends VLayout { }); }
- @Override + protected void onDraw2() { + super.onDraw(); + + HTMLFlow menu = new HTMLFlow(); + menu.setContentsType(ContentsType.PAGE); + menu.setContentsURL("/rhq/common/menu/menu.xhtml"); + addMember(menu); + } + + + // @Override protected void onDraw() { super.onDraw();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java index 8454bc4..2792255 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java @@ -46,6 +46,7 @@ public class TagCloudView extends VLayout { protected void onDraw() { super.onDraw();
+ removeMembers(getMembers());
GWTServiceLookup.getTagService().findTagReportCompositesByCriteria(new TagCriteria(), new AsyncCallback<PageList<TagReportComposite>>() {
commit a118fb535c50f0118790ab3ae3a9f3a9f6e0ec5d Author: Greg Hinkle ghinkle@redhat.com Date: Tue May 25 16:51:47 2010 -0400
fix delete for things that have tags related by adding cascading
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java index dfeed21..bed3a10 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java @@ -104,7 +104,7 @@ public class Bundle implements Serializable { @OneToMany(mappedBy = "bundle", fetch = FetchType.LAZY, cascade = CascadeType.ALL) private List<BundleVersion> bundleVersions = new ArrayList<BundleVersion>();
- @ManyToMany(mappedBy = "bundles", fetch = FetchType.LAZY) + @ManyToMany(mappedBy = "bundles", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE) private Set<Tag> tags;
public Bundle() { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDeployment.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDeployment.java index b4b95d8..52d854a 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDeployment.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDeployment.java @@ -122,7 +122,7 @@ public class BundleDeployment implements Serializable { @OneToMany(mappedBy = "bundleDeployment", fetch = FetchType.LAZY, cascade = CascadeType.ALL) private List<BundleResourceDeployment> resourceDeployments;
- @ManyToMany(mappedBy = "bundleDeployments", fetch = FetchType.LAZY) + @ManyToMany(mappedBy = "bundleDeployments", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE) private Set<Tag> tags;
public BundleDeployment() { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDestination.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDestination.java index dea011e..1dc9ec2 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDestination.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDestination.java @@ -28,6 +28,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set;
+import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -98,7 +99,7 @@ public class BundleDestination implements Serializable { @OneToMany(mappedBy = "destination", fetch = FetchType.LAZY) private List<BundleDeployment> deployments;
- @ManyToMany(mappedBy = "bundleDestinations", fetch = FetchType.LAZY) + @ManyToMany(mappedBy = "bundleDestinations", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE) private Set<Tag> tags;
public BundleDestination() { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java index a5f918b..b8417d9 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java @@ -124,7 +124,7 @@ public class BundleVersion implements Serializable { @OneToMany(mappedBy = "bundleVersion", fetch = FetchType.LAZY, cascade = CascadeType.ALL) private List<BundleFile> bundleFiles = new ArrayList<BundleFile>();
- @ManyToMany(mappedBy = "bundleVersions", fetch = FetchType.LAZY) + @ManyToMany(mappedBy = "bundleVersions", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE) private Set<Tag> tags;
public BundleVersion() { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java index 150266f..d3e69f5 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java @@ -1114,7 +1114,7 @@ public class Resource implements Comparable<Resource>, Serializable { // @OneToMany(mappedBy = "resource", fetch = FetchType.LAZY, cascade = CascadeType.ALL) // private List<BundleResourceDeployment> resourceDeployments = new ArrayList<BundleResourceDeployment>();
- @ManyToMany(mappedBy = "resources", fetch = FetchType.LAZY) + @ManyToMany(mappedBy = "resources", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE) private Set<Tag> tags;
public Resource() { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java index c8b7f1d..c9fb492 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java @@ -448,7 +448,7 @@ public class ResourceGroup extends Group { @OneToMany(mappedBy = "resourceGroup", cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH }) private Set<AlertDefinition> alertDefinitions = new LinkedHashSet<AlertDefinition>();
- @ManyToMany(mappedBy = "resourceGroups", fetch = FetchType.LAZY) + @ManyToMany(mappedBy = "resourceGroups", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE) private Set<Tag> tags;
/* no-arg constructor required by EJB spec */
commit f67db6c1e1b44b11971c450213890720902e2232 Author: Greg Hinkle ghinkle@redhat.com Date: Tue May 25 16:51:06 2010 -0400
Cleanup the wizard step canvases when the wizard closes
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java index e0f3f92..fbce82f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java @@ -19,6 +19,7 @@ package org.rhq.enterprise.gui.coregui.client.components.wizard;
import java.util.ArrayList; +import java.util.HashSet; import java.util.List;
import com.smartgwt.client.widgets.Canvas; @@ -59,6 +60,8 @@ public class WizardView extends VLayout { ArrayList<IButton> customButtons = new ArrayList<IButton>(); Canvas currentCanvas;
+ HashSet<Canvas> createdCanvases = new HashSet<Canvas>(); + public WizardView(Wizard wizard) { super(10); this.wizard = wizard; @@ -195,6 +198,8 @@ public class WizardView extends VLayout { contentLayout.removeMember(currentCanvas); } currentCanvas = wizardSteps.get(currentStep).getCanvas(); + createdCanvases.add(currentCanvas); + contentLayout.addMember(currentCanvas);
markForRedraw(); @@ -222,6 +227,12 @@ public class WizardView extends VLayout { }
public void closeDialog() { + + // Attempt to clean up canvases created in the steps + for (Canvas canvas : createdCanvases) { + canvas.markForDestroy(); + } + wizardWindow.destroy(); }
commit cb861499b222038f52a4879ae73334955716dc26 Author: Greg Hinkle ghinkle@redhat.com Date: Tue May 25 16:42:42 2010 -0400
Workaround for certain times when the upload form is not completely destroyed
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackForm.java index 81f48fe..93b8428 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackForm.java @@ -28,6 +28,8 @@ import com.smartgwt.client.widgets.form.DynamicForm;
public class DynamicCallbackForm extends DynamicForm implements DynamicCallbackFormImplHost {
+ private static int frameIndex = 0; + private String frameName; private Element synthesizedFrame; private DynamicCallbackFormHandlerCollection formHandlers; @@ -35,8 +37,8 @@ public class DynamicCallbackForm extends DynamicForm implements DynamicCallbackF
public DynamicCallbackForm(String frameName) { super(); - this.frameName = frameName; - setTarget(frameName); + this.frameName = frameName + (frameIndex++); + setTarget(this.frameName); init(); }
rhq-commits@lists.fedorahosted.org