PDI-12869 : Translator2 does not handle the new source code format very

well
shengbokw · Sep 9, 2014 · 2c819fa · 2c819fa
1 parent a5a3e26
commit 2c819fa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/translator.xml b/translator.xml
@@ -9,9 +9,6 @@
     <root>engine/src</root>
     <root>ui/src</root>
 
-    <!--- <root>dbdialog/src</root>
-    <root>jdbc/src</root> -->
-
     <root>plugins/kettle-gpload-plugin/src</root>
     <root>plugins/star-modeler/src</root>
     <root>plugins/market/src</root>
@@ -23,8 +20,7 @@
   </source-directories>
 
   <scan-phrases>
-    <scan-phrase>Messages.getString(</scan-phrase>
-    <scan-phrase>BaseMessages.getString(PKG,</scan-phrase>
+    <scan-phrase>BaseMessages.getString( PKG,</scan-phrase>
   </scan-phrases>
 
   <locale-list>
@@ -64,6 +60,7 @@
     <filename>DataHandler.java</filename>
     <filename>FragmentHandler.java</filename>
     <filename>Launch.java</filename>
+    <filename>HelpUtils.java</filename>
 
   </files-to-avoid>
 
@@ -97,4 +94,3 @@
   </xml-folders-to-scan>
 
 </translator-config>
-
diff --git a/ui/src/org/pentaho/di/ui/i18n/MessagesSourceCrawler.java b/ui/src/org/pentaho/di/ui/i18n/MessagesSourceCrawler.java
@@ -339,8 +339,8 @@ public void lookForOccurrencesInFile( String sourceFolder, FileObject javaFile )
       boolean extraLine;
       do {
         extraLine = false;
-        for ( String scanPhrase : scanPhrases ) {
-          if ( line2.endsWith( scanPhrase ) ) {
+        for ( String joinPhrase : new String[] { "BaseMessages.getString(", "BaseMessages.getString( PKG," } ) {
+          if ( line2.endsWith( joinPhrase ) ) {
             extraLine = true;
             break;
           }

diff --git a/ui/src/org/pentaho/di/ui/i18n/editor/Translator2.java b/ui/src/org/pentaho/di/ui/i18n/editor/Translator2.java
@@ -396,7 +396,7 @@ public void open() {
     addGrid();
     addListeners();
 
-    sashform.setWeights( new int[] { 20, 80 } );
+    sashform.setWeights( new int[] { 40, 60 } );
     sashform.setVisible( true );
 
     shell.pack();
@@ -486,7 +486,7 @@ private void addLists() {
     fdLocale.left = new FormAttachment( 0, 0 );
     fdLocale.right = new FormAttachment( 100, 0 );
     fdLocale.top = new FormAttachment( 0, 0 );
-    fdLocale.bottom = new FormAttachment( 20, 0 );
+    fdLocale.bottom = new FormAttachment( 10, 0 );
     wLocale.setLayoutData( fdLocale );
 
     ColumnInfo[] colinfo =
@@ -496,10 +496,7 @@ private void addLists() {
         new ColumnInfo(
           BaseMessages.getString( PKG, "i18nDialog.Packagename" ), ColumnInfo.COLUMN_TYPE_TEXT, false, true ), };
 
-    wPackages =
-      new TableView(
-        new Variables(), composite, SWT.FULL_SELECTION | SWT.SINGLE | SWT.BORDER, colinfo, 1, true, null,
-        props );
+    wPackages = new TableView( new Variables(), composite, SWT.FULL_SELECTION | SWT.SINGLE | SWT.BORDER, colinfo, 1, true, null, props );
     FormData fdPackages = new FormData();
     fdPackages.left = new FormAttachment( 0, 0 );
     fdPackages.right = new FormAttachment( 100, 0 );
@@ -1122,6 +1119,7 @@ public void refreshPackages() {
       } else {
         wPackages.setRowNums();
         wPackages.optWidth( true );
+        wPackages.getTable().getColumn( 1 ).setWidth( 100 );
       }
     }