TEIIDDES-2464 tweaked VDB server validation version check to show

warning if default minor version is > max supported minor version.
Teiid-Designer · Apr 7, 2015 · 577ed32 · 577ed32
1 parent 0aa486b
commit 577ed32
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbUtil.java b/plugins/org.teiid.designer.vdb/src/org/teiid/designer/vdb/VdbUtil.java
@@ -370,11 +370,21 @@ private static void validateVdbVersion(final IFile theVdbFile, Collection<IStatu
             statuses.add( new Status(IStatus.WARNING, VdbConstants.PLUGIN_ID,
                                      VdbPlugin.UTIL.getString("vdbValidationWarning_differentValidationVersions", validationVersion, defaultTeiidVersion)) ); //$NON-NLS-1$    
 
-        if (validationVersion.isGreaterThan(maxDesignerVersion))
-            /* Vdb version is greater than the tested Designer Teiid Version which means all bets are off! */
-            statuses.add( new Status(IStatus.ERROR, VdbConstants.PLUGIN_ID,
+        if (validationVersion.isGreaterThan(maxDesignerVersion) && !sameMinorVersion(validationVersion, maxDesignerVersion) )
+            /* Vdb version is greater than the fully-suppported Designer Teiid Version which means all bets are off! */
+            statuses.add( new Status(IStatus.WARNING, VdbConstants.PLUGIN_ID,
                                      VdbPlugin.UTIL.getString("vdbValidationError_validationVersionUnsupported")) ); //$NON-NLS-1$
     }
+
+    /**
+     * Checks to see if 2 server versions have the same major and minor versions
+     * @param version_1
+     * @param version_2
+     * @return
+     */
+    public static boolean sameMinorVersion(ITeiidServerVersion version_1, ITeiidServerVersion version_2) {
+    	return version_1.getMajor().equals(version_2.getMajor()) && version_1.getMinor().equals(version_2.getMinor());
+    }
 
 	/**
 	 * Simple check to see if the model file is in the vdb