Merge branch 'dev'

gadelkareem · Jan 28, 2016 · 3146bae · 3146bae
2 parents be0a0ee + 7f1399b
commit 3146bae
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
-Manifest-Version: 0.6.0-beta
+Manifest-Version: 1.0.0
 Main-Class: com.gadelkareem.awsclient.application.Main
 
diff --git a/package/macosx/Info.plist b/package/macosx/Info.plist
@@ -21,13 +21,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.0-beta</string>
+	<string>1.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>INTJ</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>CFBundleVersion</key>
-	<string>0.6.0-beta</string>
+	<string>1.0.0</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright (C) gadelkareem.com 2016</string>
 	<key>NSHighResolutionCapable</key>

diff --git a/pom.xml b/pom.xml
@@ -6,14 +6,23 @@
 
     <groupId>application</groupId>
     <artifactId>AwsClient</artifactId>
-    <version>0.6.0-beta</version>
+    <version>1.0.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>com.zenjava</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
@@ -22,7 +31,7 @@
                     <mainClass>com.gadelkareem.awsclient.application.Main</mainClass>
                     <identifier>awsclient</identifier>
                     <vendor>gadelkareem.com</vendor>
-                    <nativeReleaseVersion>0.6.0-beta</nativeReleaseVersion>
+                    <nativeReleaseVersion>1.0.0</nativeReleaseVersion>
                     <needShortcut>true</needShortcut>
                     <needMenu>true</needMenu>
                 </configuration>

diff --git a/src/main/java/com/gadelkareem/awsclient/application/Controller.java b/src/main/java/com/gadelkareem/awsclient/application/Controller.java
@@ -264,12 +264,10 @@ private void initEc2View() {
             columns.add("Public IP");
             columns.add("Private IP");
             columns.add("Key Name");
-            columns.add("Instance Type");
             columns.add("Launch Time");
 
 
             boolean hasFirstColumnKey = false;
-            int maxTagsCount = 0;
             reservations:
             {
                 for (Reservation reservation :
@@ -291,21 +289,22 @@ private void initEc2View() {
                         row.add(new SimpleStringProperty(instance.getPublicIpAddress()));
                         row.add(new SimpleStringProperty(instance.getPrivateIpAddress()));
                         row.add(new SimpleStringProperty(instance.getKeyName()));
-                        row.add(new SimpleStringProperty(instance.getInstanceType()));
                         row.add(new SimpleStringProperty(instance.getLaunchTime().toString()));
 
-                        maxTagsCount = instance.getTags().size() > maxTagsCount ? instance.getTags().size() : maxTagsCount;
-                        for (int i = 0; i < maxTagsCount; i++) {
-                            row.add(new SimpleStringProperty(""));
-                        }
                         for (Tag tag : instance.getTags()) {
                             if (tag.getKey().equals(firstColumnKey) && !tag.getValue().isEmpty()) {
                                 row.set(0, new SimpleStringProperty(tag.getValue()));
                                 hasFirstColumnKey = true;
                             } else {
                                 String columnHeader = "Tag::" + tag.getKey();
-                                if (!columns.contains(columnHeader))
+                                if (!columns.contains(columnHeader)) {
                                     columns.add(columnHeader);
+                                }
+                                if (columns.indexOf(columnHeader) >= row.size()) {
+                                    for (int i = row.size(); i <= columns.indexOf(columnHeader); i++) {
+                                        row.add(new SimpleStringProperty(""));
+                                    }
+                                }
                                 row.set(columns.indexOf(columnHeader), new SimpleStringProperty(tag.getValue()));
                             }
                         }

diff --git a/src/main/java/com/gadelkareem/awsclient/application/Main.java b/src/main/java/com/gadelkareem/awsclient/application/Main.java
@@ -20,7 +20,7 @@ public void start(Stage primaryStage) {
         try {
             Rectangle2D primaryScreenBounds = Screen.getPrimary().getVisualBounds();
             Parent root = FXMLLoader.load(getClass().getResource("/application.fxml"));
-            primaryStage.setTitle("AWS Client v0.6.0-beta");
+            primaryStage.setTitle("AWS Client v1.0.0");
             primaryStage.setScene(new Scene(root, primaryScreenBounds.getWidth() / 1.5, primaryScreenBounds.getHeight() / 1.5));
             primaryStage.getIcons().add(new Image(getClass().getResourceAsStream("/AwsClient.png")));
             primaryStage.show();