ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [04/10] incubator-ignite git commit: # IGNITE-330 Rename snippet.
Date Mon, 23 Mar 2015 14:33:18 GMT
# IGNITE-330 Rename snippet.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bd354504
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bd354504
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bd354504

Branch: refs/heads/ignite-release-test-no-mod
Commit: bd3545043810a45dbacf8320d4a71e9a88c7a4c9
Parents: e1b2ad6
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Mon Mar 23 19:46:26 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Mon Mar 23 19:46:26 2015 +0700

----------------------------------------------------------------------
 .../org/apache/ignite/schema/CacheConfig.java   | 38 ++++++++++++++++++++
 .../ignite/schema/ConfigurationSnippet.java     | 38 --------------------
 .../java/org/apache/ignite/schema/Demo.java     |  4 +--
 .../org/apache/ignite/schema/ui/MessageBox.java |  2 +-
 4 files changed, 41 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd354504/examples/schema-import/src/main/java/org/apache/ignite/schema/CacheConfig.java
----------------------------------------------------------------------
diff --git a/examples/schema-import/src/main/java/org/apache/ignite/schema/CacheConfig.java
b/examples/schema-import/src/main/java/org/apache/ignite/schema/CacheConfig.java
new file mode 100644
index 0000000..e5af72a
--- /dev/null
+++ b/examples/schema-import/src/main/java/org/apache/ignite/schema/CacheConfig.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.schema;
+
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.store.*;
+
+import java.util.*;
+
+/**
+ * CacheConfig stub. Will be generated by Ignite Schema Import Utility.
+ */
+public class CacheConfig {
+    /** Configure cache store. */
+    public static CacheStore store() {
+        throw new IllegalStateException("CacheConfig should be generated by Ignite Schema
Import Utility");
+    }
+
+    /** Configure cache types metadata. */
+    public static Collection<CacheTypeMetadata> typeMetadata() {
+        throw new IllegalStateException("CacheConfig should be generated by Ignite Schema
Import Utility");
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd354504/examples/schema-import/src/main/java/org/apache/ignite/schema/ConfigurationSnippet.java
----------------------------------------------------------------------
diff --git a/examples/schema-import/src/main/java/org/apache/ignite/schema/ConfigurationSnippet.java
b/examples/schema-import/src/main/java/org/apache/ignite/schema/ConfigurationSnippet.java
deleted file mode 100644
index c2029ea..0000000
--- a/examples/schema-import/src/main/java/org/apache/ignite/schema/ConfigurationSnippet.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.schema;
-
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.*;
-
-import java.util.*;
-
-/**
- * ConfigurationSnippet stub. Will be generated by Ignite Schema Import Utility.
- */
-public class ConfigurationSnippet {
-    /** Configure cache store. */
-    public static CacheStore store() {
-        throw new IllegalStateException("ConfigurationSnippet should be generated by Ignite
Schema Import Utility");
-    }
-
-    /** Configure cache types metadata. */
-    public static Collection<CacheTypeMetadata> typeMetadata() {
-        throw new IllegalStateException("ConfigurationSnippet should be generated by Ignite
Schema Import Utility");
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd354504/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
----------------------------------------------------------------------
diff --git a/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java b/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
index 450148c..fdeffab 100644
--- a/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
+++ b/examples/schema-import/src/main/java/org/apache/ignite/schema/Demo.java
@@ -34,7 +34,7 @@ public class Demo {
         CacheConfiguration ccfg = new CacheConfiguration<>();
 
         // Configure cache store.
-        ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(ConfigurationSnippet.store()));
+        ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(CacheConfig.store()));
         ccfg.setReadThrough(true);
         ccfg.setWriteThrough(true);
 
@@ -42,7 +42,7 @@ public class Demo {
         ccfg.setWriteBehindEnabled(true);
 
         // Configure cache types metadata.
-        ccfg.setTypeMetadata(ConfigurationSnippet.typeMetadata());
+        ccfg.setTypeMetadata(CacheConfig.typeMetadata());
 
         cfg.setCacheConfiguration(ccfg);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd354504/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
index 0cb1e41..378606c 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/MessageBox.java
@@ -124,7 +124,7 @@ public class MessageBox extends ModalDialog {
         contentPnl.add(ta);
 
         // Workaround for vertical scrollbar.
-        if (msg.split("\r\n|\r|\n").length < 4)
+        if (msg.length() < 100 && msg.split("\r\n|\r|\n").length < 4)
             showingProperty().addListener(new ChangeListener<Boolean>() {
                 @Override public void changed(ObservableValue<? extends Boolean> val,
Boolean oldVal, Boolean newVal) {
                     if (newVal) {


Mime
View raw message