[PDI-13378] Cannot set variable as port number in new "Named cluster"

dialog
pentaho · Jan 16, 2015 · 816c8bd · 816c8bd
1 parent 90d9df4
commit 816c8bd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/core/src/org/pentaho/di/core/namedcluster/NamedClusterManager.java b/core/src/org/pentaho/di/core/namedcluster/NamedClusterManager.java
@@ -66,15 +66,15 @@ public NamedCluster getClusterTemplate() {
       clusterTemplate = new NamedCluster();
       clusterTemplate.setName(  "new cluster" );
       clusterTemplate.setNameNodeHost( "localhost" );
-      clusterTemplate.setNameNodePort( 50070 );
+      clusterTemplate.setNameNodePort( "50070" );
       clusterTemplate.setHdfsHost( "localhost" );
-      clusterTemplate.setHdfsPort( 50075 );
+      clusterTemplate.setHdfsPort( "50075" );
       clusterTemplate.setHdfsUsername( "user" );
       clusterTemplate.setHdfsPassword( "password" );
       clusterTemplate.setJobTrackerHost( "localhost" );
-      clusterTemplate.setJobTrackerPort( 50030 );
+      clusterTemplate.setJobTrackerPort( "50030" );
       clusterTemplate.setZooKeeperHost( "localhost" );
-      clusterTemplate.setZooKeeperPort( 2888 );
+      clusterTemplate.setZooKeeperPort( "2888" );
       clusterTemplate.setOozieUrl( "http://localhost:8080/oozie" );
     }
     return clusterTemplate.clone();

diff --git a/core/src/org/pentaho/di/core/namedcluster/model/NamedCluster.java b/core/src/org/pentaho/di/core/namedcluster/model/NamedCluster.java
@@ -45,12 +45,12 @@ public class NamedCluster implements Cloneable, VariableSpace {
   @MetaStoreAttribute
   private String nameNodeHost;
   @MetaStoreAttribute
-  private int nameNodePort;
+  private String nameNodePort;
 
   @MetaStoreAttribute
   private String hdfsHost;
   @MetaStoreAttribute
-  private int hdfsPort;
+  private String hdfsPort;
   @MetaStoreAttribute
   private String hdfsUsername;
   @MetaStoreAttribute ( password=true )
@@ -59,12 +59,12 @@ public class NamedCluster implements Cloneable, VariableSpace {
   @MetaStoreAttribute
   private String jobTrackerHost;
   @MetaStoreAttribute
-  private int jobTrackerPort;
+  private String jobTrackerPort;
 
   @MetaStoreAttribute
   private String zooKeeperHost;
   @MetaStoreAttribute
-  private int zooKeeperPort;
+  private String zooKeeperPort;
 
   @MetaStoreAttribute
   private String oozieUrl;
@@ -210,11 +210,11 @@ public void setNameNodeHost( String nameNodeHost ) {
     this.nameNodeHost = nameNodeHost;
   }
 
-  public int getNameNodePort() {
+  public String getNameNodePort() {
     return nameNodePort;
   }
 
-  public void setNameNodePort( int nameNodePort ) {
+  public void setNameNodePort( String nameNodePort ) {
     this.nameNodePort = nameNodePort;
   }
 
@@ -226,11 +226,11 @@ public void setHdfsHost( String hdfsHost ) {
     this.hdfsHost = hdfsHost;
   }
 
-  public int getHdfsPort() {
+  public String getHdfsPort() {
     return hdfsPort;
   }
 
-  public void setHdfsPort( int hdfsPort ) {
+  public void setHdfsPort( String hdfsPort ) {
     this.hdfsPort = hdfsPort;
   }
 
@@ -258,11 +258,11 @@ public void setJobTrackerHost( String jobTrackerHost ) {
     this.jobTrackerHost = jobTrackerHost;
   }
 
-  public int getJobTrackerPort() {
+  public String getJobTrackerPort() {
     return jobTrackerPort;
   }
 
-  public void setJobTrackerPort( int jobTrackerPort ) {
+  public void setJobTrackerPort( String jobTrackerPort ) {
     this.jobTrackerPort = jobTrackerPort;
   }
 
@@ -274,11 +274,11 @@ public void setZooKeeperHost( String zooKeeperHost ) {
     this.zooKeeperHost = zooKeeperHost;
   }  
 
-  public int getZooKeeperPort() {
+  public String getZooKeeperPort() {
     return zooKeeperPort;
   }
 
-  public void setZooKeeperPort( int zooKeeperPort ) {
+  public void setZooKeeperPort( String zooKeeperPort ) {
     this.zooKeeperPort = zooKeeperPort;
   } 
 
@@ -298,4 +298,4 @@ public void setLastModifiedDate( long lastModifiedDate ) {
     this.lastModifiedDate = lastModifiedDate;
   } 
 
-}
+}
diff --git a/ui/src/org/pentaho/di/ui/core/namedcluster/dialog/NamedClusterComposite.java b/ui/src/org/pentaho/di/ui/core/namedcluster/dialog/NamedClusterComposite.java
@@ -73,7 +73,7 @@ public NamedClusterComposite( Composite parent, NamedCluster namedCluster, Props
     gridData.widthHint = 300;
 
     numberGridData = new GridData();
-    numberGridData.widthHint = 80;
+    numberGridData.widthHint = 160;
 
     labelGridData = new GridData();
     labelGridData.widthHint = 300;
@@ -210,7 +210,7 @@ public void invoke( NamedCluster nc, TextVar textVar, String value ) {
     Callback hdfsPortCB = new Callback() {
       public void invoke( NamedCluster nc, TextVar textVar, String value ) {
         try {
-          nc.setHdfsPort( Integer.parseInt( value ) );
+          nc.setHdfsPort( value );
         } catch ( NumberFormatException nfe ) {
           textVar.setText( "" + nc.getHdfsPort() );
         }
@@ -258,7 +258,7 @@ public void invoke( NamedCluster nc, TextVar textVar, String value ) {
     Callback portCB = new Callback() {
       public void invoke( NamedCluster nc, TextVar textVar, String value ) {
         try {
-          nc.setNameNodePort( Integer.parseInt( value ) );
+          nc.setNameNodePort( value );
         } catch ( NumberFormatException nfe ) {
           textVar.setText( "" + nc.getNameNodePort() );
         }        
@@ -286,7 +286,7 @@ public void invoke( NamedCluster nc, TextVar textVar, String value ) {
     Callback portCB = new Callback() {
       public void invoke( NamedCluster nc, TextVar textVar, String value ) {
         try {
-          nc.setJobTrackerPort( Integer.parseInt( value ) );
+          nc.setJobTrackerPort( value );
         } catch ( NumberFormatException nfe ) {
           textVar.setText( "" + nc.getJobTrackerPort() );
         }   
@@ -314,7 +314,7 @@ public void invoke( NamedCluster nc, TextVar textVar, String value ) {
     Callback portCB = new Callback() {
       public void invoke( NamedCluster nc, TextVar textVar, String value ) {
         try {
-          nc.setZooKeeperPort( Integer.parseInt( value ) );
+          nc.setZooKeeperPort( value );
         } catch ( NumberFormatException nfe ) {
           textVar.setText( "" + nc.getZooKeeperPort() );
         }