Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0754E1853B for ; Mon, 20 Jul 2015 08:26:51 +0000 (UTC) Received: (qmail 23978 invoked by uid 500); 20 Jul 2015 08:26:28 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 23945 invoked by uid 500); 20 Jul 2015 08:26:28 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 23925 invoked by uid 99); 20 Jul 2015 08:26:28 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jul 2015 08:26:28 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 75D541896B3 for ; Mon, 20 Jul 2015 08:26:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id toKJOBc5RAXS for ; Mon, 20 Jul 2015 08:26:20 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 435B92164D for ; Mon, 20 Jul 2015 08:26:20 +0000 (UTC) Received: (qmail 23769 invoked by uid 99); 20 Jul 2015 08:26:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jul 2015 08:26:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EE89FE0414; Mon, 20 Jul 2015 08:26:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ivasilinets@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 20 Jul 2015 08:26:20 -0000 Message-Id: <85c7eedc4a704bcd80dbfe88d121c0ec@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/4] incubator-ignite git commit: Fixed typo and minor fixes to javadocs. Fixed typo and minor fixes to javadocs. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ede96121 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ede96121 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ede96121 Branch: refs/heads/ignite-961-master Commit: ede961215ce3a596f7dcb90e82f48aa723d892bf Parents: 192fefc Author: AKuznetsov Authored: Mon Jul 20 15:06:04 2015 +0700 Committer: AKuznetsov Committed: Mon Jul 20 15:06:04 2015 +0700 ---------------------------------------------------------------------- .../ignite/schema/ui/SchemaImportApp.java | 36 ++++++++++++++++---- 1 file changed, 29 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ede96121/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java ---------------------------------------------------------------------- diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java index 00d1bc8..7b9c220 100644 --- a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java +++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java @@ -109,7 +109,7 @@ public class SchemaImportApp extends Application { "jdbc:mysql://[host]:[port]/[database]", "root"), new Preset("mssql", "Microsoft SQL Server", "sqljdbc41.jar", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "jdbc:sqlserver://[host]:[port][;databaseName=database]", "sa"), - new Preset("posgresql", "PostgreSQL", "postgresql-9.3.jdbc4.jar", "org.postgresql.Driver", + new Preset("postgresql", "PostgreSQL", "postgresql-9.3.jdbc4.jar", "org.postgresql.Driver", "jdbc:postgresql://[host]:[port]/[database]", "sa"), new Preset("custom", "Custom server...", "custom-jdbc.jar", "org.custom.Driver", "jdbc:custom", "sa") }; @@ -444,6 +444,11 @@ public class SchemaImportApp extends Application { final boolean singleXml = xmlSingleFileCh.isSelected(); Runnable task = new Task() { + /** + * @param pojo POJO descriptor to check. + * @param selected Selected flag. + * @param msg Message to show in case of check failed. + */ private void checkEmpty(final PojoDescriptor pojo, boolean selected, String msg) { if (!selected) { Platform.runLater(new Runnable() { @@ -694,6 +699,8 @@ public class SchemaImportApp extends Application { /** * Create connection pane with controls. + * + * @return Pane with connection controls. */ private Pane createConnectionPane() { connPnl = paneEx(10, 10, 0, 10); @@ -1110,10 +1117,10 @@ public class SchemaImportApp extends Application { if (curPojo != null) { TableView.TableViewSelectionModel selMdl = pojosTbl.getSelectionModel(); - List idxs = new ArrayList<>(selMdl.getSelectedIndices()); + List selIndices = new ArrayList<>(selMdl.getSelectedIndices()); - if (idxs.size() > 1) { - for (Integer idx : idxs) { + if (selIndices.size() > 1) { + for (Integer idx : selIndices) { if (pojos.get(idx) != curPojo) selMdl.clearSelection(idx); } @@ -1242,6 +1249,7 @@ public class SchemaImportApp extends Application { * * @param key Property key. * @param dflt Default value. + * @return Property value as string. */ private String getStringProp(String key, String dflt) { String val = prefs.getProperty(key); @@ -1267,6 +1275,7 @@ public class SchemaImportApp extends Application { * * @param key Property key. * @param dflt Default value. + * @return Property value as int. */ private int getIntProp(String key, int dflt) { String val = prefs.getProperty(key); @@ -1297,6 +1306,7 @@ public class SchemaImportApp extends Application { * * @param key Property key. * @param dflt Default value. + * @return Property value as boolean. */ private boolean getBoolProp(String key, boolean dflt) { String val = prefs.getProperty(key); @@ -1563,7 +1573,11 @@ public class SchemaImportApp extends Application { /** Combo box. */ private final ComboBox comboBox; - /** Creates a ComboBox cell factory for use in TableColumn controls. */ + /** + * Creates a ComboBox cell factory for use in TableColumn controls. + * + * @return Cell factory for cell with java types combobox. + */ public static Callback, TableCell> cellFactory() { return new Callback, TableCell>() { @Override public TableCell call(TableColumn col) { @@ -1637,7 +1651,11 @@ public class SchemaImportApp extends Application { * Special table cell to select schema or table. */ private static class PojoDescriptorCell extends TableCell { - /** Creates a ComboBox cell factory for use in TableColumn controls. */ + /** + * Creates a ComboBox cell factory for use in TableColumn controls. + * + * @return Cell factory for schema / table selection. + */ public static Callback, TableCell> cellFactory() { return new Callback, TableCell>() { @Override public TableCell call(TableColumn col) { @@ -1694,7 +1712,11 @@ public class SchemaImportApp extends Application { * Special table cell to select "used" fields for code generation. */ private static class PojoFieldUseCell extends TableCell { - /** Creates a ComboBox cell factory for use in TableColumn controls. */ + /** + * Creates a ComboBox cell factory for use in TableColumn controls. + * + * @return Cell factory for used fields selection. + */ public static Callback, TableCell> cellFactory() { return new Callback, TableCell>() { @Override public TableCell call(TableColumn col) {