You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2011/02/10 21:09:50 UTC
svn commit: r1069550 - in
/incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin:
Activator.java VaadinClient.java
Author: marrs
Date: Thu Feb 10 20:09:50 2011
New Revision: 1069550
URL: http://svn.apache.org/viewvc?rev=1069550&view=rev
Log:
More fixes to the target dialog.
Modified:
incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Activator.java
incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java
Modified: incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Activator.java?rev=1069550&r1=1069549&r2=1069550&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Activator.java (original)
+++ incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Activator.java Thu Feb 10 20:09:50 2011
@@ -78,13 +78,15 @@ public class Activator extends Dependenc
final NamedObject object = (NamedObject) context.get("object");
VerticalLayout vl = new VerticalLayout();
vl.setCaption("Info");
- Button button = new Button("info", new Button.ClickListener() {
- public void buttonClick(ClickEvent event) {
- event.getButton().getWindow().showNotification(object.getName(), "Description: " + object.getName());
- }
- });
- vl.addComponent(new Label("Hit the button to see a message pop up!"));
- vl.addComponent(button);
+ final NamedObject namedObject = (NamedObject) context.get("object");
+ final StatefulGatewayObject target = (StatefulGatewayObject) namedObject.getObject();
+ Label info = new Label("Target ID: " + namedObject.getName() + "<br />" +
+ "Installed version: " + target.getLastInstallVersion() + "<br />" +
+ "Available version: " + target.getCurrentVersion() + "<br />" +
+ "Provisioning state: " + target.getProvisioningState() + "<br />" +
+ "Registration state: " + target.getRegistrationState());
+ info.setContentMode(Label.CONTENT_XHTML);
+ vl.addComponent(info);
return vl;
}
})
Modified: incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java?rev=1069550&r1=1069549&r2=1069550&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java (original)
+++ incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java Thu Feb 10 20:09:50 2011
@@ -1078,7 +1078,7 @@ public class VaadinClient extends com.va
final Window featureWindow = new Window();
featureWindow.setModal(true);
featureWindow.setCaption("Edit " + objectName + ": " + object.getName());
- featureWindow.setWidth("50em");
+ featureWindow.setWidth("500px");
// Configure the windws layout; by default a VerticalLayout
VerticalLayout layout = (VerticalLayout) featureWindow.getContent();
@@ -1095,21 +1095,13 @@ public class VaadinClient extends com.va
// layout.addComponent(description);
TabSheet tabs = new TabSheet();
- tabs.setHeight("12em");
+ tabs.setHeight("350px");
Map<String, Object> context = new HashMap<String, Object>();
context.put("object", object);
for (UIExtensionFactory factory : m_factories) {
com.vaadin.ui.Component component = factory.create(context);
tabs.addTab(component);
}
- VerticalLayout tab1 = new VerticalLayout();
- tab1.setCaption("Demo 1");
- tab1.addComponent(new Label("This is a hardcoded demo tab."));
- VerticalLayout tab2 = new VerticalLayout();
- tab2.setCaption("Demo 2");
- tab2.addComponent(new Label("This one is too, you cannot remove it for now."));
- tabs.addTab(tab1);
- tabs.addTab(tab2);
layout.addComponent(tabs);
Button close = new Button("Ok", new Button.ClickListener() {