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 2010/03/19 23:28:52 UTC
svn commit: r925463 - in
/incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client:
AddBundleDialog.java GroupTable.java LicenseTable.java Main.java
Author: marrs
Date: Fri Mar 19 22:28:51 2010
New Revision: 925463
URL: http://svn.apache.org/viewvc?rev=925463&view=rev
Log:
Applied r900161.
Modified:
incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/AddBundleDialog.java
incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/GroupTable.java
incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/LicenseTable.java
incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/Main.java
Modified: incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/AddBundleDialog.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/AddBundleDialog.java?rev=925463&r1=925462&r2=925463&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/AddBundleDialog.java (original)
+++ incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/AddBundleDialog.java Fri Mar 19 22:28:51 2010
@@ -50,7 +50,7 @@ public class AddBundleDialog extends Dia
OBRServiceAsync m_obrService = GWT.create(OBRService.class);
AddBundleDialog(final Main main) {
- setText("Add bundle");
+ setText("Add artifact");
final ObjectListBox<OBRBundleDescriptor> obrFiles = new ObjectListBox<OBRBundleDescriptor>();
obrFiles.setVisibleItemCount(8);
@@ -74,12 +74,12 @@ public class AddBundleDialog extends Dia
// Create the button panel
HorizontalPanel buttonPanel = new HorizontalPanel();
- Button saveButton = new Button("Save");
+ Button saveButton = new Button("Add");
saveButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
m_obrService.importBundle(obrFiles.getSelectedObject(), new AsyncCallback<Void>() {
public void onFailure(Throwable caught) {
- Window.alert("Error importing bundle " + obrFiles.getSelectedObject());
+ Window.alert("Error importing artifact " + obrFiles.getSelectedObject());
}
public void onSuccess(Void result) {
main.updateUI();
@@ -100,7 +100,7 @@ public class AddBundleDialog extends Dia
// Put the dialog together
VerticalPanel content = new VerticalPanel();
- content.add(new Label("Where is your bundle?"));
+ content.add(new Label("Where is your artifact?"));
content.add(stackPanel);
buttonPanel.add(cancelButton);
Modified: incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/GroupTable.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/GroupTable.java?rev=925463&r1=925462&r2=925463&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/GroupTable.java (original)
+++ incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/GroupTable.java Fri Mar 19 22:28:51 2010
@@ -55,11 +55,11 @@ public class GroupTable extends ObjectTa
}
void addNew() {
- String result = Window.prompt("Add group", "New group");
+ String result = Window.prompt("Add feature", "New feature");
if (result != null) {
m_groupService.addGroup(result, new AsyncCallback<Void>() {
public void onFailure(Throwable caught) {
- Window.alert("Error adding group.");
+ Window.alert("Error adding feature.");
}
public void onSuccess(Void result) {
// Hurrah!
Modified: incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/LicenseTable.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/LicenseTable.java?rev=925463&r1=925462&r2=925463&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/LicenseTable.java (original)
+++ incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/LicenseTable.java Fri Mar 19 22:28:51 2010
@@ -55,11 +55,11 @@ public class LicenseTable extends Object
}
void addNew() {
- String result = Window.prompt("Add license", "New license");
+ String result = Window.prompt("Add distribution", "New distribution");
if (result != null) {
m_licenseService.addLicense(result, new AsyncCallback<Void>() {
public void onFailure(Throwable caught) {
- Window.alert("Error adding license.");
+ Window.alert("Error adding distribution.");
}
public void onSuccess(Void result) {
// Hurrah!
Modified: incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/Main.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/Main.java?rev=925463&r1=925462&r2=925463&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/Main.java (original)
+++ incubator/ace/trunk/ace-webui/src/main/java/org/apache/ace/client/Main.java Fri Mar 19 22:28:51 2010
@@ -145,16 +145,16 @@ public class Main implements EntryPoint
FlexCellFormatter formatter = rootPanel.getFlexCellFormatter();
rootPanel.setWidth("100%");
rootPanel.setHeight("100%");
- rootPanel.setHTML(1, 0, "Bundle");
+ rootPanel.setHTML(1, 0, "Artifact");
formatter.setWidth(1, 0, "25%");
rootPanel.setWidget(2, 0, addBundleButton);
rootPanel.setWidget(3, 0, bundleScrollPanel);
formatter.setHeight(3, 0, "90%");
- rootPanel.setHTML(1, 1, "Group");
+ rootPanel.setHTML(1, 1, "Feature");
formatter.setWidth(1, 1, "25%");
rootPanel.setWidget(2, 1, addGroupButton);
rootPanel.setWidget(3, 1, groupScrollPanel);
- rootPanel.setHTML(1, 2, "License");
+ rootPanel.setHTML(1, 2, "Distribution");
formatter.setWidth(1, 2, "25%");
rootPanel.setWidget(2, 2, addLicenseButton);
rootPanel.setWidget(3, 2, licenseScrollPanel);
@@ -255,7 +255,7 @@ public class Main implements EntryPoint
private static final boolean VERBOSE = true;
public StatusLabel() {
- setText("checking server status...");
+ setText("Checking server status...");
}
public void handleFail(String table) {
@@ -276,12 +276,12 @@ public class Main implements EntryPoint
}
if (allOk) {
- setText("Server connection all happy.");
+ setText("Connected to server.");
setStyleName("serverStatusGood");
}
else {
StringBuilderImpl sb = new StringBuilderImpl();
- sb.append("Error communicating with server.");
+ sb.append("Not connected to server.");
if (VERBOSE) {
for (Map.Entry<String, Boolean> entry : m_statuses.entrySet()) {
if (!entry.getValue()) {