Skip to content

Commit

Permalink
# IGNITE-32: Working on renaming.
Browse files Browse the repository at this point in the history
  • Loading branch information
@akuznetsov-gridgain
akuznetsov-gridgain committed Jan 26, 2015
1 parent b8deac3 commit 03f01a6
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 57 deletions.
28 changes: 28 additions & 0 deletions modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java
View file
Expand Up @@ -20,6 +20,7 @@
import com.sun.javafx.scene.control.skin.*;
import javafx.application.*;
import javafx.beans.value.*;
import javafx.collections.*;
import javafx.event.*;
import javafx.geometry.*;
import javafx.scene.*;
Expand Down Expand Up @@ -180,6 +181,16 @@ public static <T extends Control> T tooltip(T ctrl, String tip) {
return ctrl;
}

/**
* Create label.
*
* @param text Label text.
* @return New {@code Label} instance.
*/
public static Label label(String text) {
return new Label(text);
}

/**
* Create button with text only.
*
Expand Down Expand Up @@ -297,6 +308,23 @@ public static PasswordField passwordField(String tip) {
return pf;
}

/**
* Create combo box.
* @param tip Tooltip text.
* @param items Combo box items.
* @return New {@code ComboBox} instance.
*/
public static ComboBox<String> comboBox(String tip, String... items) {
ComboBox<String> cb = new ComboBox<>(FXCollections.observableArrayList(items));

cb.setMaxWidth(Double.MAX_VALUE);
cb.getSelectionModel().select(0);

tooltip(cb, tip);

return cb;
}

/**
* Create split pane for provided nodes.
*
Expand Down
91 changes: 34 additions & 57 deletions modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java
View file
Expand Up @@ -366,7 +366,7 @@ private void checkEmpty(final PojoDescriptor pojo, Collection<CacheQueryTypeDesc
* @return Header pane with title label.
*/
private Pane createHeaderPane() {
titleLb = new Label("");
titleLb = label("");
titleLb.setId("banner");

BorderPane bp = borderPane(null, hBox(10, true, titleLb), null, null, hBox(0, true, imageView("ignite", 48)));
Expand Down Expand Up @@ -626,14 +626,14 @@ private void createGeneratePane() {
TableColumn<PojoDescriptor, Boolean> useCol = customColumn("Schema / Table", "use",
"If checked then this table will be used for XML and POJOs generation", PojoDescriptorCell.cellFactory());

TableColumn<PojoDescriptor, String> keyClsCol = textColumn("Key Class", "keyClassName", "Key class name",
TableColumn<PojoDescriptor, String> keyClsCol = textColumn("Key Class Name", "keyClassName", "Key class name",
new TextColumnValidator<PojoDescriptor>() {
@Override public boolean valid(PojoDescriptor rowVal, String newVal) {
return checkClassName(rowVal, newVal, true);
}
});

TableColumn<PojoDescriptor, String> valClsCol = textColumn("Value Class", "valueClassName", "Value class name",
TableColumn<PojoDescriptor, String> valClsCol = textColumn("Value Class Name", "valueClassName", "Value class name",
new TextColumnValidator<PojoDescriptor>() {
@Override public boolean valid(PojoDescriptor rowVal, String newVal) {
return checkClassName(rowVal, newVal, false);
Expand Down Expand Up @@ -710,65 +710,41 @@ private void createGeneratePane() {
regexPnl.addColumn();
regexPnl.addColumn(100, 100, Double.MAX_VALUE, Priority.ALWAYS);

regexPnl.add(new Label("Replace Java name for selected or all tables:"), 4);
regexTf = regexPnl.addLabeled(" Regexp:", textField("Regular expression. For example: (\\w+)"));
replaceTf = regexPnl.addLabeled(" Replace with:", textField("Replace text. For example: $1_Suffix"));

final Button renBtn = button("Rename", "Replace Java names by provided regular expression for current table",
new EventHandler<ActionEvent>() {
@Override public void handle(ActionEvent evt) {
if (curPojo == null) {
MessageBox.warningDialog(owner, "Please select table to rename Java names!");

return;
}

if (checkInput(regexTf, false, "Regular expression should not be empty!"))
return;

String regex = regexTf.getText();
regexPnl.add(label("Replace \"Key class name\", \"Value class name\" or \"Java name\" for selected tables:"), 4);

String replace = replaceTf.getText();
regexTf = regexPnl.addLabeled(" Regexp:", textField("Regular expression. For example: (\\w+)"));

try {
for (PojoField field : curPojo.fields())
field.javaName(field.javaName().replaceAll(regex, replace));
}
catch (Exception e) {
MessageBox.errorDialog(owner, "Failed to rename Java names!", e);
}
}
});
renBtn.setDisable(true);
replaceTf = regexPnl.addLabeled(" Replace with:", textField("Replace text. For example: $1_SomeText"));

final Button revertBtn = button("Revert", "Revert changes to Java names for current table", new EventHandler<ActionEvent>() {
@Override public void handle(ActionEvent evt) {
if (curPojo != null)
curPojo.revertJavaNames();
else
MessageBox.warningDialog(owner, "Please select table to revert changes to Java names!");
}
});
revertBtn.setDisable(true);
final ComboBox<String> replaceCb = regexPnl.addLabeled(" Replace:", comboBox("Replacement target",
"Key class names", "Value class names", "Java names"));

regexPnl.add(buttonsPane(Pos.BOTTOM_RIGHT, false,
renBtn,
button("Rename All", "Replace Java names by provided regular expression for all selected tables",
button("Rename Selected", "Replaces each substring of this string that matches the given regular expression" +
" with the given replacement.",
new EventHandler<ActionEvent>() {
@Override public void handle(ActionEvent evt) {
if (checkInput(regexTf, false, "Regular expression should not be empty!"))
return;

String sel = replaceCb.getSelectionModel().getSelectedItem();

boolean renFields = "Java names".equals(sel);

String src = (renFields ? "fields" : "tables");

String target = "\"" + sel +"\"";

Collection<PojoDescriptor> selItems = selectedItems();

if (selItems.isEmpty()) {
MessageBox.warningDialog(owner, "Please select tables to rename Java names!");
MessageBox.warningDialog(owner, "Please select " + src + " to rename " + target + "!");

return;
}

if (!MessageBox.confirmDialog(owner,
"Are you sure you want to rename Java names in all selected tables?"))
if (!MessageBox.confirmDialog(owner, "Are you sure you want to rename " + target +
" for all selected " + src + "?"))
return;

String regex = regexTf.getText();
Expand All @@ -781,30 +757,37 @@ private void createGeneratePane() {
field.javaName(field.javaName().replaceAll(regex, replace));
}
catch (Exception e) {
MessageBox.errorDialog(owner, "Failed to rename Java names!", e);
MessageBox.errorDialog(owner, "Failed to rename " + target + "!", e);
}
}
}),
revertBtn,
button("Revert All", "Revert changes to Java names for all selected tables", new EventHandler<ActionEvent>() {
button("Reset Selected", "Revert changes for selected items to initial values", new EventHandler<ActionEvent>() {
@Override public void handle(ActionEvent evt) {
Collection<PojoDescriptor> selItems = selectedItems();

String sel = replaceCb.getSelectionModel().getSelectedItem();

boolean renFields = "Java names".equals(sel);

String src = (renFields ? "fields" : "tables");

String target = "\"" + sel +"\"";

if (selItems.isEmpty()) {
MessageBox.warningDialog(owner, "Please select tables to revert Java names!");
MessageBox.warningDialog(owner, "Please select " + src + "to revert " + target + "!");

return;
}

if (!MessageBox.confirmDialog(owner,
"Are you sure you want to revert Java names for all selected tables?"))
"Are you sure you want to revert " + target + " for all selected " + src + "?"))
return;

for (PojoDescriptor pojo : selItems)
pojo.revertJavaNames();
}
})
), 4);
), 2);

pojosTbl.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<PojoDescriptor>() {
@Override public void changed(ObservableValue<? extends PojoDescriptor> val,
Expand All @@ -816,18 +799,12 @@ private void createGeneratePane() {
fieldsTbl.getSelectionModel().select(0);

keyValPnl.setDisable(false);

renBtn.setDisable(false);
revertBtn.setDisable(false);
}
else {
curPojo = null;
fieldsTbl.setItems(NO_FIELDS);

keyValPnl.setDisable(true);

renBtn.setDisable(true);
revertBtn.setDisable(true);
}
}
});
Expand Down

0 comments on commit 03f01a6

Please sign in to comment.