You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/30 06:17:00 UTC
[2/2] incubator-ignite git commit: # IGNITE-32 WIP: UI tweaks and
minor code cleanup.
# IGNITE-32 WIP: UI tweaks and minor code cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/00329951
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00329951
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00329951
Branch: refs/heads/ignite-32
Commit: 003299516472f149a533dc306489dcc26b445bba
Parents: 71737a7
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Dec 30 12:17:00 2014 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Dec 30 12:17:00 2014 +0700
----------------------------------------------------------------------
.../src/main/java/media/branch_128x128.png | Bin 3766 -> 0 bytes
.../src/main/java/media/branch_16x16.png | Bin 411 -> 0 bytes
.../src/main/java/media/branch_32x32.png | Bin 775 -> 0 bytes
.../src/main/java/media/branch_48x48.png | Bin 1139 -> 0 bytes
.../main/java/media/data_connection_48x48.png | Bin 0 -> 4443 bytes
.../src/main/java/media/ignite_128x128.png | Bin 0 -> 4917 bytes
.../src/main/java/media/ignite_16x16.png | Bin 0 -> 608 bytes
.../src/main/java/media/ignite_24x24.png | Bin 0 -> 930 bytes
.../src/main/java/media/ignite_32x32.png | Bin 0 -> 1203 bytes
.../src/main/java/media/ignite_48x48.png | Bin 0 -> 1868 bytes
.../src/main/java/media/ignite_64x64.png | Bin 0 -> 2453 bytes
.../src/main/java/media/sign_warning_48x48.png | Bin 0 -> 2988 bytes
.../schema-load/src/main/java/media/style.css | 25 ++++++--
.../src/main/java/media/text_tree_48x48.png | Bin 0 -> 2567 bytes
.../ignite/schema/db/DbMetadataParser.java | 7 ---
.../ignite/schema/pojo/PojoCodeGenerator.java | 14 +----
.../org/apache/ignite/schema/ui/Controls.java | 7 ---
.../org/apache/ignite/schema/ui/GridPaneEx.java | 7 ---
.../org/apache/ignite/schema/ui/MessageBox.java | 18 +++---
.../apache/ignite/schema/ui/SchemaLoadApp.java | 21 +++----
.../apache/ignite/schema/util/SchemaUtils.java | 7 ---
.../ignite/schema/xml/XmlTransformer.java | 9 +--
.../java/org/apache/ignite/Organization.java | 59 ++++++++++++++++++-
.../java/org/apache/ignite/OrganizationKey.java | 33 ++++++++++-
.../src/test/java/org/apache/ignite/Person.java | 59 ++++++++++++++++++-
.../test/java/org/apache/ignite/PersonKey.java | 33 ++++++++++-
.../auto/AbstractAutoCacheStoreSelfTest.java | 7 ---
.../store/auto/AutoCacheStoreSelfTest.java | 7 ---
.../gridgain/grid/cache/store/auto/package.html | 5 --
29 files changed, 227 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/media/branch_128x128.png
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/media/branch_128x128.png b/modules/schema-load/src/main/java/media/branch_128x128.png
deleted file mode 100644
index dacee19..0000000
Binary files a/modules/schema-load/src/main/java/media/branch_128x128.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/media/branch_16x16.png
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/media/branch_16x16.png b/modules/schema-load/src/main/java/media/branch_16x16.png
deleted file mode 100644
index 9764668..0000000
Binary files a/modules/schema-load/src/main/java/media/branch_16x16.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/media/branch_32x32.png
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/media/branch_32x32.png b/modules/schema-load/src/main/java/media/branch_32x32.png
deleted file mode 100644
index 8f39620..0000000
Binary files a/modules/schema-load/src/main/java/media/branch_32x32.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/media/branch_48x48.png
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/media/branch_48x48.png b/modules/schema-load/src/main/java/media/branch_48x48.png
deleted file mode 100644
index a956f2c..0000000
Binary files a/modules/schema-load/src/main/java/media/branch_48x48.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/media/data_connection_48x48.png
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/media/data_connection_48x48.png b/modules/schema-load/src/main/java/media/data_connection_48x48.png
new file mode 100644
index 0000000..475f219
Binary files /dev/null and b/modules/schema-load/src/main/java/media/data_connection_48x48.png differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/media/ignite_128x128.png
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/media/ignite_128x128.png b/modules/schema-load/src/main/java/media/ignite_128x128.png
new file mode 100644
index 0000000..d99a83c
Binary files /dev/null and b/modules/schema-load/src/main/java/media/ignite_128x128.png differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/media/ignite_16x16.png
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/media/ignite_16x16.png b/modules/schema-load/src/main/java/media/ignite_16x16.png
new file mode 100644
index 0000000..3e07d33
Binary files /dev/null and b/modules/schema-load/src/main/java/media/ignite_16x16.png differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/media/ignite_24x24.png
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/media/ignite_24x24.png b/modules/schema-load/src/main/java/media/ignite_24x24.png
new file mode 100644
index 0000000..8da5c97
Binary files /dev/null and b/modules/schema-load/src/main/java/media/ignite_24x24.png differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/media/ignite_32x32.png
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/media/ignite_32x32.png b/modules/schema-load/src/main/java/media/ignite_32x32.png
new file mode 100644
index 0000000..c6c6819
Binary files /dev/null and b/modules/schema-load/src/main/java/media/ignite_32x32.png differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/media/ignite_48x48.png
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/media/ignite_48x48.png b/modules/schema-load/src/main/java/media/ignite_48x48.png
new file mode 100644
index 0000000..5b684cc
Binary files /dev/null and b/modules/schema-load/src/main/java/media/ignite_48x48.png differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/media/ignite_64x64.png
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/media/ignite_64x64.png b/modules/schema-load/src/main/java/media/ignite_64x64.png
new file mode 100644
index 0000000..c1d348b
Binary files /dev/null and b/modules/schema-load/src/main/java/media/ignite_64x64.png differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/media/sign_warning_48x48.png
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/media/sign_warning_48x48.png b/modules/schema-load/src/main/java/media/sign_warning_48x48.png
new file mode 100644
index 0000000..5e7cccd
Binary files /dev/null and b/modules/schema-load/src/main/java/media/sign_warning_48x48.png differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/media/style.css
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/media/style.css b/modules/schema-load/src/main/java/media/style.css
index ac3f760..b93a759 100644
--- a/modules/schema-load/src/main/java/media/style.css
+++ b/modules/schema-load/src/main/java/media/style.css
@@ -1,5 +1,10 @@
+.root {
+ -fx-background-color: eeeeee;
+}
+
.button {
-fx-font-size: 14;
+ -fx-focus-color: gray;
}
.label {
@@ -8,15 +13,26 @@
.check-box {
-fx-font-size: 14;
+ -fx-focus-color: gray;
}
-.text-area {
+.text-field {
-fx-font-size: 14;
- -fx-strikethrough: true;
+ -fx-background-color: -fx-text-box-border, -fx-control-inner-background, -fx-control-inner-background;
+ -fx-background-radius: 0, 0, 0, 0;
}
-.text-field {
- -fx-font-size: 14;
+.text-field:focused {
+ -fx-background-color: -fx-text-box-border, -fx-control-inner-background, -fx-control-inner-background;
+ -fx-background-radius: 0, 0, 0, 0;
+}
+
+.tree-view {
+ -fx-focus-color: gray;
+}
+
+.table-view {
+ -fx-focus-color: gray;
}
.tooltip {
@@ -30,4 +46,5 @@
#banner {
-fx-font-size: 20px;
-fx-font-weight: bold;
+ -fx-background-color: white
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/media/text_tree_48x48.png
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/media/text_tree_48x48.png b/modules/schema-load/src/main/java/media/text_tree_48x48.png
new file mode 100644
index 0000000..6ca9e65
Binary files /dev/null and b/modules/schema-load/src/main/java/media/text_tree_48x48.png differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/org/apache/ignite/schema/db/DbMetadataParser.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/db/DbMetadataParser.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/db/DbMetadataParser.java
index 15f05e9..352be7e 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/db/DbMetadataParser.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/db/DbMetadataParser.java
@@ -1,12 +1,5 @@
/* @java.file.header */
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
package org.apache.ignite.schema.db;
import org.apache.ignite.lang.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/org/apache/ignite/schema/pojo/PojoCodeGenerator.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/pojo/PojoCodeGenerator.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/pojo/PojoCodeGenerator.java
index 537d682..094a3e5 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/pojo/PojoCodeGenerator.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/pojo/PojoCodeGenerator.java
@@ -1,12 +1,5 @@
/* @java.file.header */
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
package org.apache.ignite.schema.pojo;
import org.gridgain.grid.cache.query.*;
@@ -86,7 +79,7 @@ public class PojoCodeGenerator {
add0(src, "package " + pkg + ";");
add0(src, "");
add0(src, "/**");
- add0(src, " * Description of " + type + ".");
+ add0(src, " * " + type + " definition.");
add0(src, " *");
add0(src, " * Code generated by Apache Ignite Schema Load utility.");
add0(src, " */");
@@ -103,7 +96,6 @@ public class PojoCodeGenerator {
// Constructors.
if (constructor) {
-
add1(src, "/**");
add1(src, " * Empty constructor.");
add1(src, " */");
@@ -138,11 +130,11 @@ public class PojoCodeGenerator {
// Methods.
for (GridCacheQueryTypeDescriptor desc : descs) {
String fldName = desc.getJavaName();
+
String fldType = desc.getJavaType().getSimpleName();
String mtdName = capitalizeFirst(fldName);
-
add1(src, "/**");
add1(src, " * Gets " + fldName + ".");
add1(src, " *");
@@ -157,7 +149,7 @@ public class PojoCodeGenerator {
add1(src, "/**");
add1(src, " * Sets " + fldName + ".");
add1(src, " *");
- add1(src, " * @param New value for " + fldName + ".");
+ add1(src, " * @param " + fldName + " New value for " + fldName + ".");
add1(src, " */");
add1(src, "public void set" + mtdName + "(" + fldType + " " + fldName + ") {");
add2(src, "this." + fldName + " = " + fldName + ";");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java
index 73ffd3e..edec0b8 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java
@@ -1,12 +1,5 @@
/* @java.file.header */
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
package org.apache.ignite.schema.ui;
import javafx.event.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java
index 3a63c77..3dfe975 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java
@@ -1,12 +1,5 @@
/* @java.file.header */
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
package org.apache.ignite.schema.ui;
import javafx.geometry.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/MessageBox.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
index 9a6b7c5..151fe13 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
@@ -1,12 +1,5 @@
/* @java.file.header */
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
package org.apache.ignite.schema.ui;
import javafx.event.*;
@@ -130,6 +123,17 @@ public class MessageBox extends Stage {
}
/**
+ * Show warning dialog.
+ *
+ * @param owner Owner window.
+ * @param msg Message to show.
+ */
+ public static void warningDialog(Stage owner, String msg) {
+ showDialog(owner, "Warning", msg, "sign_warning", false);
+ }
+
+
+ /**
* Show error dialog.
*
* @param owner Owner window.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java
index fdcbe2a..2cb7cb5 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java
@@ -1,12 +1,5 @@
/* @java.file.header */
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
package org.apache.ignite.schema.ui;
import javafx.application.*;
@@ -169,7 +162,7 @@ public class SchemaLoadApp extends Application {
}
if (all.isEmpty())
- MessageBox.informationDialog(owner, "Nothing selected");
+ MessageBox.warningDialog(owner, "Nothing selected!");
else {
if (xmlSingleFileCh.isSelected())
XmlTransformer.transform(pkg, all, new File(outFolder, "all.xml"));
@@ -192,6 +185,7 @@ public class SchemaLoadApp extends Application {
titleLb.setId("banner");
hb.getChildren().add(titleLb);
+ hb.setId("banner");
return hb;
}
@@ -224,6 +218,7 @@ public class SchemaLoadApp extends Application {
*/
private void prev() {
titleLb.setText("Connect To Database");
+ titleLb.setGraphic(imageView("data_connection", 48));
rootPane.setCenter(connPnl);
@@ -238,6 +233,7 @@ public class SchemaLoadApp extends Application {
if (rootPane.getCenter() == connPnl) {
if (fill()) {
titleLb.setText("Generate XML And POJOs");
+ titleLb.setGraphic(imageView("text_tree", 48));
rootPane.setCenter(genPnl);
@@ -346,8 +342,13 @@ public class SchemaLoadApp extends Application {
primaryStage.setTitle("Schema Load");
- primaryStage.getIcons()
- .addAll(image("branch", 16), image("branch", 32), image("branch", 48), image("branch", 128));
+ primaryStage.getIcons().addAll(
+ image("ignite", 16),
+ image("ignite", 24),
+ image("ignite", 32),
+ image("ignite", 48),
+ image("ignite", 64),
+ image("ignite", 128));
rootPane = new BorderPane();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/org/apache/ignite/schema/util/SchemaUtils.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/util/SchemaUtils.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/util/SchemaUtils.java
index ee1f636..ddc053a 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/util/SchemaUtils.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/util/SchemaUtils.java
@@ -1,12 +1,5 @@
/* @java.file.header */
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
package org.apache.ignite.schema.util;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/main/java/org/apache/ignite/schema/xml/XmlTransformer.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/xml/XmlTransformer.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/xml/XmlTransformer.java
index 0b03970..c1b3962 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/xml/XmlTransformer.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/xml/XmlTransformer.java
@@ -1,12 +1,5 @@
/* @java.file.header */
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
package org.apache.ignite.schema.xml;
import org.apache.ignite.lang.*;
@@ -22,7 +15,7 @@ import java.io.*;
import java.util.*;
/**
- * Transformer that will take cache query metadata and write it to xml.
+ * Transformer that will take cache query metadata and transform it to XML and write to file.
*/
public class XmlTransformer {
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/test/java/org/apache/ignite/Organization.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/test/java/org/apache/ignite/Organization.java b/modules/schema-load/src/test/java/org/apache/ignite/Organization.java
index 50c1a40..c204158 100644
--- a/modules/schema-load/src/test/java/org/apache/ignite/Organization.java
+++ b/modules/schema-load/src/test/java/org/apache/ignite/Organization.java
@@ -1,33 +1,90 @@
package org.apache.ignite;
-/** Code generated by Apache Ignite Schema Load utility. */
+/**
+ * Organization definition.
+ *
+ * Code generated by Apache Ignite Schema Load utility.
+ */
public class Organization {
+ /** Value for id. */
private Integer id;
+ /** Value for name. */
private String name;
+ /** Value for city. */
private String city;
+ /**
+ * Empty constructor.
+ */
+ public Organization() {
+ // No-op.
+ }
+
+ /**
+ * Full constructor.
+ */
+ public Organization(
+ Integer id,
+ String name,
+ String city
+ ) {
+ this.id = id;
+ this.name = name;
+ this.city = city;
+ }
+
+ /**
+ * Gets id.
+ *
+ * @return Value for id.
+ */
public Integer getId() {
return id;
}
+ /**
+ * Sets id.
+ *
+ * @param id New value for id.
+ */
public void setId(Integer id) {
this.id = id;
}
+ /**
+ * Gets name.
+ *
+ * @return Value for name.
+ */
public String getName() {
return name;
}
+ /**
+ * Sets name.
+ *
+ * @param name New value for name.
+ */
public void setName(String name) {
this.name = name;
}
+ /**
+ * Gets city.
+ *
+ * @return Value for city.
+ */
public String getCity() {
return city;
}
+ /**
+ * Sets city.
+ *
+ * @param city New value for city.
+ */
public void setCity(String city) {
this.city = city;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/test/java/org/apache/ignite/OrganizationKey.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/test/java/org/apache/ignite/OrganizationKey.java b/modules/schema-load/src/test/java/org/apache/ignite/OrganizationKey.java
index 08ee36f..8451c7b 100644
--- a/modules/schema-load/src/test/java/org/apache/ignite/OrganizationKey.java
+++ b/modules/schema-load/src/test/java/org/apache/ignite/OrganizationKey.java
@@ -1,13 +1,44 @@
package org.apache.ignite;
-/** Code generated by Apache Ignite Schema Load utility. */
+/**
+ * OrganizationKey definition.
+ *
+ * Code generated by Apache Ignite Schema Load utility.
+ */
public class OrganizationKey {
+ /** Value for id. */
private Integer id;
+ /**
+ * Empty constructor.
+ */
+ public OrganizationKey() {
+ // No-op.
+ }
+
+ /**
+ * Full constructor.
+ */
+ public OrganizationKey(
+ Integer id
+ ) {
+ this.id = id;
+ }
+
+ /**
+ * Gets id.
+ *
+ * @return Value for id.
+ */
public Integer getId() {
return id;
}
+ /**
+ * Sets id.
+ *
+ * @param id New value for id.
+ */
public void setId(Integer id) {
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/test/java/org/apache/ignite/Person.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/test/java/org/apache/ignite/Person.java b/modules/schema-load/src/test/java/org/apache/ignite/Person.java
index 1ce68d8..7baf86d 100644
--- a/modules/schema-load/src/test/java/org/apache/ignite/Person.java
+++ b/modules/schema-load/src/test/java/org/apache/ignite/Person.java
@@ -1,33 +1,90 @@
package org.apache.ignite;
-/** Code generated by Apache Ignite Schema Load utility. */
+/**
+ * Person definition.
+ *
+ * Code generated by Apache Ignite Schema Load utility.
+ */
public class Person {
+ /** Value for id. */
private Integer id;
+ /** Value for orgId. */
private Integer orgId;
+ /** Value for name. */
private String name;
+ /**
+ * Empty constructor.
+ */
+ public Person() {
+ // No-op.
+ }
+
+ /**
+ * Full constructor.
+ */
+ public Person(
+ Integer id,
+ Integer orgId,
+ String name
+ ) {
+ this.id = id;
+ this.orgId = orgId;
+ this.name = name;
+ }
+
+ /**
+ * Gets id.
+ *
+ * @return Value for id.
+ */
public Integer getId() {
return id;
}
+ /**
+ * Sets id.
+ *
+ * @param id New value for id.
+ */
public void setId(Integer id) {
this.id = id;
}
+ /**
+ * Gets orgId.
+ *
+ * @return Value for orgId.
+ */
public Integer getOrgId() {
return orgId;
}
+ /**
+ * Sets orgId.
+ *
+ * @param orgId New value for orgId.
+ */
public void setOrgId(Integer orgId) {
this.orgId = orgId;
}
+ /**
+ * Gets name.
+ *
+ * @return Value for name.
+ */
public String getName() {
return name;
}
+ /**
+ * Sets name.
+ *
+ * @param name New value for name.
+ */
public void setName(String name) {
this.name = name;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/test/java/org/apache/ignite/PersonKey.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/test/java/org/apache/ignite/PersonKey.java b/modules/schema-load/src/test/java/org/apache/ignite/PersonKey.java
index 64a5511..183f9db 100644
--- a/modules/schema-load/src/test/java/org/apache/ignite/PersonKey.java
+++ b/modules/schema-load/src/test/java/org/apache/ignite/PersonKey.java
@@ -1,13 +1,44 @@
package org.apache.ignite;
-/** Code generated by Apache Ignite Schema Load utility. */
+/**
+ * PersonKey definition.
+ *
+ * Code generated by Apache Ignite Schema Load utility.
+ */
public class PersonKey {
+ /** Value for id. */
private Integer id;
+ /**
+ * Empty constructor.
+ */
+ public PersonKey() {
+ // No-op.
+ }
+
+ /**
+ * Full constructor.
+ */
+ public PersonKey(
+ Integer id
+ ) {
+ this.id = id;
+ }
+
+ /**
+ * Gets id.
+ *
+ * @return Value for id.
+ */
public Integer getId() {
return id;
}
+ /**
+ * Sets id.
+ *
+ * @param id New value for id.
+ */
public void setId(Integer id) {
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/test/java/org/gridgain/grid/cache/store/auto/AbstractAutoCacheStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/test/java/org/gridgain/grid/cache/store/auto/AbstractAutoCacheStoreSelfTest.java b/modules/schema-load/src/test/java/org/gridgain/grid/cache/store/auto/AbstractAutoCacheStoreSelfTest.java
index fcb9786..a964151 100644
--- a/modules/schema-load/src/test/java/org/gridgain/grid/cache/store/auto/AbstractAutoCacheStoreSelfTest.java
+++ b/modules/schema-load/src/test/java/org/gridgain/grid/cache/store/auto/AbstractAutoCacheStoreSelfTest.java
@@ -1,12 +1,5 @@
/* @java.file.header */
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
package org.gridgain.grid.cache.store.auto;
import org.apache.ignite.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/test/java/org/gridgain/grid/cache/store/auto/AutoCacheStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/test/java/org/gridgain/grid/cache/store/auto/AutoCacheStoreSelfTest.java b/modules/schema-load/src/test/java/org/gridgain/grid/cache/store/auto/AutoCacheStoreSelfTest.java
index a0892d3..5930986 100644
--- a/modules/schema-load/src/test/java/org/gridgain/grid/cache/store/auto/AutoCacheStoreSelfTest.java
+++ b/modules/schema-load/src/test/java/org/gridgain/grid/cache/store/auto/AutoCacheStoreSelfTest.java
@@ -1,12 +1,5 @@
/* @java.file.header */
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
package org.gridgain.grid.cache.store.auto;
import org.gridgain.grid.util.typedef.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00329951/modules/schema-load/src/test/java/org/gridgain/grid/cache/store/auto/package.html
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/test/java/org/gridgain/grid/cache/store/auto/package.html b/modules/schema-load/src/test/java/org/gridgain/grid/cache/store/auto/package.html
index 5cad80a..7a92630 100644
--- a/modules/schema-load/src/test/java/org/gridgain/grid/cache/store/auto/package.html
+++ b/modules/schema-load/src/test/java/org/gridgain/grid/cache/store/auto/package.html
@@ -1,11 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!--
@html.file.header
- _________ _____ __________________ _____
- __ ____/___________(_)______ /__ ____/______ ____(_)_______
- _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
-->
<html>
<body>