externalized strings in file manager plugin
authorVictor Kirhenshtein <victor@netxms.org>
Tue, 11 Nov 2014 14:49:15 +0000 (16:49 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Tue, 11 Nov 2014 14:49:15 +0000 (16:49 +0200)
39 files changed:
doc/versions.txt
src/java/netxms-base/src/main/java/org/netxms/base/NXCommon.java
src/java/netxms-eclipse/Core/META-INF/MANIFEST.MF
src/java/netxms-eclipse/FileManager/META-INF/MANIFEST.MF
src/java/netxms-eclipse/FileManager/OSGI-INF/l10n/bundle.properties
src/java/netxms-eclipse/FileManager/OSGI-INF/l10n/bundle_de.properties [new file with mode: 0644]
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/Messages.java
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/actions/OpenFileManager.java
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/actions/UploadFileToAgent.java
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/dialogs/CreateFolderDialog.java
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/dialogs/RenameFileDialog.java
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/dialogs/StartClientToAgentFolderUploadDialog.java
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/messages.properties
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/messages_cs.properties
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/messages_de.properties [copied from src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/messages.properties with 54% similarity]
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/messages_es.properties
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/messages_ru.properties
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/messages_zh_CN.properties
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/views/AgentFileManager.java
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/views/helpers/ServerFileLabelProvider.java
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/views/helpers/ViewAgentFilesProvider.java
tools/sync_message_files.py
webui/webapp/FileManager/META-INF/MANIFEST.MF
webui/webapp/FileManager/OSGI-INF/l10n/bundle.properties
webui/webapp/FileManager/OSGI-INF/l10n/bundle_de.properties [new file with mode: 0644]
webui/webapp/FileManager/src/org/netxms/ui/eclipse/filemanager/Messages.java
webui/webapp/FileManager/src/org/netxms/ui/eclipse/filemanager/actions/OpenFileManager.java
webui/webapp/FileManager/src/org/netxms/ui/eclipse/filemanager/actions/UploadFileToAgent.java
webui/webapp/FileManager/src/org/netxms/ui/eclipse/filemanager/dialogs/CreateFolderDialog.java
webui/webapp/FileManager/src/org/netxms/ui/eclipse/filemanager/dialogs/RenameFileDialog.java
webui/webapp/FileManager/src/org/netxms/ui/eclipse/filemanager/messages.properties
webui/webapp/FileManager/src/org/netxms/ui/eclipse/filemanager/messages_cs.properties
webui/webapp/FileManager/src/org/netxms/ui/eclipse/filemanager/messages_de.properties [copied from src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/messages.properties with 54% similarity]
webui/webapp/FileManager/src/org/netxms/ui/eclipse/filemanager/messages_es.properties
webui/webapp/FileManager/src/org/netxms/ui/eclipse/filemanager/messages_ru.properties
webui/webapp/FileManager/src/org/netxms/ui/eclipse/filemanager/messages_zh_CN.properties
webui/webapp/FileManager/src/org/netxms/ui/eclipse/filemanager/views/AgentFileManager.java
webui/webapp/FileManager/src/org/netxms/ui/eclipse/filemanager/views/helpers/ServerFileLabelProvider.java
webui/webapp/FileManager/src/org/netxms/ui/eclipse/filemanager/views/helpers/ViewAgentFilesProvider.java

index 63ea3a7..24f1baa 100644 (file)
@@ -5,13 +5,29 @@ NetXMS Versioning Scheme
 major.minor.release
 
 
-2.x
+2.x onward
 
-major.minor.type.release
+* Product version
+
+major.minor-qualifier
 
 type denotes release type:
-       0       development
-       1       release candidate
-       2       stable release
+       Mn      development milestone (like M3)
+       RCn     release candidate (like RC1)
+       RELEASE stable release
+
+so first 2.x version is 2.0-M1 and first release version is 2.0-RELEASE
+
+
+* Java API version
+
+major.minor-qualifier
+
+Same as product versioning
+
+
+* Eclipse plugins version
+
+major.minor.release
 
-so first release version is 2.0.2.0
+release is internal number incremented after each plugin change. Major and minor corresponds to product version.
index 487272b..1c48308 100644 (file)
@@ -26,7 +26,7 @@ import java.util.UUID;
 public final class NXCommon
 {
        // Version information
-       public static final String VERSION = "2.0.0.0";
+       public static final String VERSION = "2.0-M1";
        
        public static final UUID EMPTY_GUID = UUID.fromString("00000000-0000-0000-0000-000000000000");
 }
index beeabaa..24c1f81 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.netxms.ui.eclipse.console;singleton:=true
-Bundle-Version: 2.0.0.0
+Bundle-Version: 2.0.0
 Bundle-Activator: org.netxms.ui.eclipse.console.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
index 79f4dde..a5a6f2e 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NetXMS FileManager
 Bundle-SymbolicName: org.netxms.ui.eclipse.filemanager;singleton:=true
-Bundle-Version: 1.2.17
+Bundle-Version: 2.0.0
 Bundle-Activator: org.netxms.ui.eclipse.filemanager.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
index 99c39e7..9728536 100644 (file)
@@ -1,13 +1,13 @@
 #Properties file for org.netxms.ui.eclipse.filemanager
+action.label.ServerFileList = Server File List
 action.label.UploadFile = Upload file...
+action.label.UploadToServer = Upload file to server...
+action.tooltip.ServerFileList = Show list with files stored by netXMS on server side
+action.tooltip.UploadToServer = Upload local file to server's file store
+actionSet.label.FileManager = File Manager Action Set
+category.Views = Views
 command.description.UploadToServer = Upload local file to server
 command.description.ServerFileList = Open server file list
 command.name.UploadToServer = Upload file to server...
 command.name.ServerFileList = Open server file list
-actionSet.label.FileManager = File Manager Action Set
-action.label.UploadToServer = Upload file to server...
-action.label.ServerFileList = Server File List
-action.tooltip.UploadToServer = Upload local file to server's file store
-action.tooltip.ServerFileList = Show list with files stored by netXMS on server side
 view.ServerFileList.name = Server File List
-category.Views = Views
\ No newline at end of file
diff --git a/src/java/netxms-eclipse/FileManager/OSGI-INF/l10n/bundle_de.properties b/src/java/netxms-eclipse/FileManager/OSGI-INF/l10n/bundle_de.properties
new file mode 100644 (file)
index 0000000..a94000a
--- /dev/null
@@ -0,0 +1,12 @@
+action.label.ServerFileList= Server File List
+action.label.UploadFile= Upload file...
+action.label.UploadToServer= Upload file to server...
+action.tooltip.ServerFileList= Show list with files stored by netXMS on server side
+action.tooltip.UploadToServer= Upload local file to server's file store
+actionSet.label.FileManager= File Manager Action Set
+category.Views= Views
+command.description.ServerFileList= Open server file list
+command.description.UploadToServer= Upload local file to server
+command.name.ServerFileList= Open server file list
+command.name.UploadToServer= Upload file to server...
+view.ServerFileList.name= Server File List
index a4a584d..9b6a3d7 100644 (file)
@@ -5,13 +5,51 @@ import org.eclipse.osgi.util.NLS;
 public class Messages extends NLS
 {
        private static final String BUNDLE_NAME = "org.netxms.ui.eclipse.filemanager.messages"; //$NON-NLS-1$
-       public static String GetServerFileList_ErrorMessageFileView;
+       public static String AgentFileManager_AllFiles;
+   public static String AgentFileManager_ColDate;
+   public static String AgentFileManager_ColName;
+   public static String AgentFileManager_ColSize;
+   public static String AgentFileManager_ColType;
+   public static String AgentFileManager_CreateFolder;
+   public static String AgentFileManager_CreatingFolder;
+   public static String AgentFileManager_Delete;
+   public static String AgentFileManager_DirectoryReadError;
+   public static String AgentFileManager_Download;
+   public static String AgentFileManager_DownloadFileFromAgent;
+   public static String AgentFileManager_DownloadJobError;
+   public static String AgentFileManager_DownloadJobTitle;
+   public static String AgentFileManager_Error;
+   public static String AgentFileManager_FileDownloadError;
+   public static String AgentFileManager_FolderCreationError;
+   public static String AgentFileManager_MoveError;
+   public static String AgentFileManager_MoveFile;
+   public static String AgentFileManager_OpenViewError;
+   public static String AgentFileManager_PartTitle;
+   public static String AgentFileManager_RefreshFolder;
+   public static String AgentFileManager_Rename;
+   public static String AgentFileManager_RenameError;
+   public static String AgentFileManager_Show;
+   public static String AgentFileManager_StartDownloadDialogTitle;
+   public static String AgentFileManager_UploadFile;
+   public static String AgentFileManager_UploadFileJobTitle;
+   public static String AgentFileManager_UploadFolder;
+   public static String AgentFileManager_UploadFolderJobTitle;
+   public static String CreateFolderDialog_Label;
+   public static String CreateFolderDialog_Title;
+   public static String GetServerFileList_ErrorMessageFileView;
    public static String GetServerFileList_ErrorMessageFileViewTitle;
    public static String LocalFileSelector_AllFiles;
        public static String LocalFileSelector_None;
        public static String LocalFileSelector_SelectFile;
        public static String LocalFileSelector_Tooltip;
-       public static String SelectServerFileDialog_ColModTime;
+   public static String OpenFileManager_Error;
+   public static String OpenFileManager_ErrorText;
+       public static String RenameFileDialog_NewName;
+   public static String RenameFileDialog_OldName;
+   public static String RenameFileDialog_Title;
+   public static String RenameFileDialog_Warning;
+   public static String RenameFileDialog_WarningMessage;
+   public static String SelectServerFileDialog_ColModTime;
        public static String SelectServerFileDialog_ColName;
        public static String SelectServerFileDialog_ColSize;
        public static String SelectServerFileDialog_JobError;
@@ -21,7 +59,8 @@ public class Messages extends NLS
        public static String SelectServerFileDialog_WarningText;
        public static String ServerFileSelector_None;
        public static String ServerFileSelector_Tooltip;
-       public static String StartClientToServerFileUploadDialog_LocalFile;
+       public static String StartClientToAgentFolderUploadDialog_Title;
+   public static String StartClientToServerFileUploadDialog_LocalFile;
        public static String StartClientToServerFileUploadDialog_RemoteFileName;
        public static String StartClientToServerFileUploadDialog_Title;
        public static String StartClientToServerFileUploadDialog_Warning;
@@ -37,7 +76,10 @@ public class Messages extends NLS
        public static String UploadFileToServer_JobError;
        public static String UploadFileToServer_JobTitle;
        public static String UploadFileToServer_TaskNamePrefix;
-       public static String ViewServerFile_DeletAck;
+       public static String ViewAgentFilesProvider_JobError;
+   public static String ViewAgentFilesProvider_JobTitle;
+   public static String ViewAgentFilesProvider_Loading;
+   public static String ViewServerFile_DeletAck;
    public static String ViewServerFile_DeleteConfirmation;
    public static String ViewServerFile_DeleteFileOnServerAction;
    public static String ViewServerFile_DeletFileFromServerJob;
index cdbd3b2..2627e1f 100644 (file)
@@ -27,6 +27,7 @@ import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.netxms.client.objects.AbstractObject;
+import org.netxms.ui.eclipse.filemanager.Messages;
 import org.netxms.ui.eclipse.filemanager.views.AgentFileManager;
 import org.netxms.ui.eclipse.tools.MessageDialogHelper;
 
@@ -61,7 +62,8 @@ public class OpenFileManager implements IObjectActionDelegate
          }
          catch(PartInitException e)
          {
-            MessageDialogHelper.openError(window.getShell(), "Show node file list error", "Error: " + e.getMessage());
+            MessageDialogHelper.openError(window.getShell(), 
+                  Messages.get().OpenFileManager_Error, String.format(Messages.get().OpenFileManager_ErrorText, e.getMessage()));
          }
       }
    }
index d236703..34dbf1d 100644 (file)
@@ -85,7 +85,7 @@ public class UploadFileToAgent implements IObjectActionDelegate
                                   String remoteFileName = dlg.getRemoteFileName();
                                   if(!remoteFileName.isEmpty())
                                   {
-                                     if(remoteFileName.endsWith("/") || remoteFileName.endsWith("\\"))
+                                     if(remoteFileName.endsWith("/") || remoteFileName.endsWith("\\")) //$NON-NLS-1$ //$NON-NLS-2$
                                      {
                                         remoteFileName += dlg.getServerFile().getName();
                                      }
index fd7558a..28b5575 100644 (file)
@@ -1,6 +1,6 @@
 /**
  * NetXMS - open source network management system
- * Copyright (C) 2003-2011 Victor Kirhenshtein
+ * Copyright (C) 2003-2014 Victor Kirhenshtein
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.netxms.ui.eclipse.filemanager.Messages;
-import org.netxms.ui.eclipse.tools.MessageDialogHelper;
 import org.netxms.ui.eclipse.tools.WidgetHelper;
 import org.netxms.ui.eclipse.widgets.LabeledText;
 
@@ -54,7 +53,7 @@ public class CreateFolderDialog extends Dialog
        protected void configureShell(Shell newShell)
        {
                super.configureShell(newShell);
-               newShell.setText(Messages.get().StartClientToServerFileUploadDialog_Title);
+               newShell.setText(Messages.get().CreateFolderDialog_Title);
        }
 
        /* (non-Javadoc)
@@ -72,7 +71,7 @@ public class CreateFolderDialog extends Dialog
                dialogArea.setLayout(layout);
       
                textNewDirectoryName = new LabeledText(dialogArea, SWT.NONE);
-               textNewDirectoryName.setLabel("New folder name");
+               textNewDirectoryName.setLabel(Messages.get().CreateFolderDialog_Label);
       GridData gd = new GridData();
       gd.horizontalAlignment = SWT.FILL;
       gd.grabExcessHorizontalSpace = true;
index ae25927..9426d58 100644 (file)
@@ -1,6 +1,6 @@
 /**
  * NetXMS - open source network management system
- * Copyright (C) 2003-2011 Victor Kirhenshtein
+ * Copyright (C) 2003-2014 Victor Kirhenshtein
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ public class RenameFileDialog extends Dialog
        protected void configureShell(Shell newShell)
        {
                super.configureShell(newShell);
-               newShell.setText(Messages.get().StartClientToServerFileUploadDialog_Title);
+               newShell.setText(Messages.get().RenameFileDialog_Title);
        }
 
        /* (non-Javadoc)
@@ -77,7 +77,7 @@ public class RenameFileDialog extends Dialog
                GridData gd;
                
                textOldFileName = new LabeledText(dialogArea, SWT.NONE);
-               textOldFileName.setLabel("Old file name");
+               textOldFileName.setLabel(Messages.get().RenameFileDialog_OldName);
                gd = new GridData();
                gd.horizontalAlignment = SWT.FILL;
                gd.grabExcessHorizontalSpace = true;
@@ -86,7 +86,7 @@ public class RenameFileDialog extends Dialog
       textOldFileName.setEditable(false);
       
       textNewFileName = new LabeledText(dialogArea, SWT.NONE);
-      textNewFileName.setLabel("New file name");
+      textNewFileName.setLabel(Messages.get().RenameFileDialog_NewName);
       gd = new GridData();
       gd.horizontalAlignment = SWT.FILL;
       gd.grabExcessHorizontalSpace = true;
@@ -102,9 +102,9 @@ public class RenameFileDialog extends Dialog
        protected void okPressed()
        {
           newFileName = textNewFileName.getText();
-          if(newFileName.contains("/") || newFileName.contains("\\"))
+          if (newFileName.contains("/") || newFileName.contains("\\")) //$NON-NLS-1$ //$NON-NLS-2$
           {
-             MessageDialogHelper.openWarning(getShell(), "Rename file error", "File name should not contain '/' and '\\' symbols");
+             MessageDialogHelper.openWarning(getShell(), Messages.get().RenameFileDialog_Warning, Messages.get().RenameFileDialog_WarningMessage);
              return;
           }
              
index c38ab45..728a461 100644 (file)
@@ -58,7 +58,7 @@ public class StartClientToAgentFolderUploadDialog extends Dialog
        protected void configureShell(Shell newShell)
        {
                super.configureShell(newShell);
-               newShell.setText(Messages.get().StartClientToServerFileUploadDialog_Title);
+               newShell.setText(Messages.get().StartClientToAgentFolderUploadDialog_Title);
        }
 
        /* (non-Javadoc)
index bf77e4c..01bdbc2 100644 (file)
@@ -1,9 +1,47 @@
+AgentFileManager_AllFiles=All Files
+AgentFileManager_ColDate=Date modified
+AgentFileManager_ColName=Name
+AgentFileManager_ColSize=Size
+AgentFileManager_ColType=Type
+AgentFileManager_CreateFolder=&Create folder
+AgentFileManager_CreatingFolder=Creating folder
+AgentFileManager_Delete=&Delete
+AgentFileManager_DirectoryReadError=Cannot read remote directory
+AgentFileManager_Download=&Download...
+AgentFileManager_DownloadFileFromAgent=Download file from agent
+AgentFileManager_DownloadJobError=Error downloading file %s from node %d
+AgentFileManager_DownloadJobTitle=Download file from agent and start tail
+AgentFileManager_Error=Error
+AgentFileManager_FileDownloadError=Error while downloading file %s from node %s [%d]
+AgentFileManager_FolderCreationError=Cannot create folder
+AgentFileManager_MoveError=Cannot move file
+AgentFileManager_MoveFile=Moving file
+AgentFileManager_OpenViewError=Error opening view: %s
+AgentFileManager_PartTitle=File Manager - %s
+AgentFileManager_RefreshFolder=Refresh this folder
+AgentFileManager_Rename=&Rename
+AgentFileManager_RenameError=Cannot rename file
+AgentFileManager_Show=&Show
+AgentFileManager_StartDownloadDialogTitle=Start Download
+AgentFileManager_UploadFile=&Upload file...
+AgentFileManager_UploadFileJobTitle=Upload file to agent
+AgentFileManager_UploadFolder=&Upload folder...
+AgentFileManager_UploadFolderJobTitle=Upload folder to agent
+CreateFolderDialog_Label=New folder name
+CreateFolderDialog_Title=Create Folder
 GetServerFileList_ErrorMessageFileView=Error opening server file list: 
 GetServerFileList_ErrorMessageFileViewTitle=Error opening server file view
 LocalFileSelector_AllFiles=All files
 LocalFileSelector_None=<none>
 LocalFileSelector_SelectFile=Select File
 LocalFileSelector_Tooltip=Select file
+OpenFileManager_Error=Error
+OpenFileManager_ErrorText=Cannot open file manager: %s
+RenameFileDialog_NewName=New file name
+RenameFileDialog_OldName=Old file name
+RenameFileDialog_Title=Rename
+RenameFileDialog_Warning=Warning
+RenameFileDialog_WarningMessage=File name should not contain '/' and '\\' symbols
 SelectServerFileDialog_ColModTime=Modified
 SelectServerFileDialog_ColName=Name
 SelectServerFileDialog_ColSize=Size
@@ -14,6 +52,7 @@ SelectServerFileDialog_Warning=Warning
 SelectServerFileDialog_WarningText=Please select file from the list
 ServerFileSelector_None=<none>
 ServerFileSelector_Tooltip=Select file
+StartClientToAgentFolderUploadDialog_Title=Start Folder Upload
 StartClientToServerFileUploadDialog_LocalFile=Local file
 StartClientToServerFileUploadDialog_RemoteFileName=Remote file name
 StartClientToServerFileUploadDialog_Title=Upload File
@@ -30,6 +69,9 @@ UploadFileToAgent_JobTitle=Initiate file upload to agent
 UploadFileToServer_JobError=Cannot upload file to server
 UploadFileToServer_JobTitle=Upload file to server
 UploadFileToServer_TaskNamePrefix=Upload file 
+ViewAgentFilesProvider_JobError=Cannot read remote directory
+ViewAgentFilesProvider_JobTitle=Reading remote directory
+ViewAgentFilesProvider_Loading=Loading...
 ViewServerFile_DeletAck=Are you sure you want to delete this file?
 ViewServerFile_DeleteConfirmation=Delete confirmation
 ViewServerFile_DeleteFileOnServerAction=Delete file on server
index 4d01ab5..88ae5ae 100644 (file)
@@ -1,9 +1,47 @@
+AgentFileManager_AllFiles=All Files
+AgentFileManager_ColDate=Date modified
+AgentFileManager_ColName=Name
+AgentFileManager_ColSize=Size
+AgentFileManager_ColType=Type
+AgentFileManager_CreateFolder=&Create folder
+AgentFileManager_CreatingFolder=Creating folder
+AgentFileManager_Delete=&Delete
+AgentFileManager_DirectoryReadError=Cannot read remote directory
+AgentFileManager_Download=&Download...
+AgentFileManager_DownloadFileFromAgent=Download file from agent
+AgentFileManager_DownloadJobError=Error downloading file %s from node %d
+AgentFileManager_DownloadJobTitle=Download file from agent and start tail
+AgentFileManager_Error=Error
+AgentFileManager_FileDownloadError=Error while downloading file %s from node %s [%d]
+AgentFileManager_FolderCreationError=Cannot create folder
+AgentFileManager_MoveError=Cannot move file
+AgentFileManager_MoveFile=Moving file
+AgentFileManager_OpenViewError=Error opening view: %s
+AgentFileManager_PartTitle=File Manager - %s
+AgentFileManager_RefreshFolder=Refresh this folder
+AgentFileManager_Rename=&Rename
+AgentFileManager_RenameError=Cannot rename file
+AgentFileManager_Show=&Show
+AgentFileManager_StartDownloadDialogTitle=Start Download
+AgentFileManager_UploadFile=&Upload file...
+AgentFileManager_UploadFileJobTitle=Upload file to agent
+AgentFileManager_UploadFolder=&Upload folder...
+AgentFileManager_UploadFolderJobTitle=Upload folder to agent
+CreateFolderDialog_Label=New folder name
+CreateFolderDialog_Title=Create Folder
 GetServerFileList_ErrorMessageFileView=Error opening server file list:
 GetServerFileList_ErrorMessageFileViewTitle=Error opening server file view
 LocalFileSelector_AllFiles=V\u0161echny soubory
 LocalFileSelector_None=<\u017E\u00E1dn\u00FD>
 LocalFileSelector_SelectFile=Vybrat soubor
 LocalFileSelector_Tooltip=Vybrat soubor
+OpenFileManager_Error=Error
+OpenFileManager_ErrorText=Cannot open file manager: %s
+RenameFileDialog_NewName=New file name
+RenameFileDialog_OldName=Old file name
+RenameFileDialog_Title=Rename
+RenameFileDialog_Warning=Warning
+RenameFileDialog_WarningMessage=File name should not contain '/' and '\\' symbols
 SelectServerFileDialog_ColModTime=Modifikovan\u00FD
 SelectServerFileDialog_ColName=N\u00E1zev
 SelectServerFileDialog_ColSize=Velikost
@@ -14,6 +52,7 @@ SelectServerFileDialog_Warning=Varov\u00E1n\u00ED
 SelectServerFileDialog_WarningText=Pros\u00EDm vyberte soubor ze seznamu
 ServerFileSelector_None=<\u017E\u00E1dn\u00FD>
 ServerFileSelector_Tooltip=Vybrat soubor
+StartClientToAgentFolderUploadDialog_Title=Start Folder Upload
 StartClientToServerFileUploadDialog_LocalFile=Lok\u00E1ln\u00ED soubor
 StartClientToServerFileUploadDialog_RemoteFileName=N\u00E1zev vzd\u00E1len\u00E9ho souboru
 StartClientToServerFileUploadDialog_Title=Nahr\u00E1t soubor
@@ -30,6 +69,9 @@ UploadFileToAgent_JobTitle=Inicializovat nahr\u00E1n\u00ED souboru do agenta
 UploadFileToServer_JobError=Nelze nahr\u00E1t soubor na server
 UploadFileToServer_JobTitle=Nahr\u00E1t soubor na server
 UploadFileToServer_TaskNamePrefix=Nahr\u00E1t soubor
+ViewAgentFilesProvider_JobError=Cannot read remote directory
+ViewAgentFilesProvider_JobTitle=Reading remote directory
+ViewAgentFilesProvider_Loading=Loading...
 ViewServerFile_DeletAck=Are you sure you want to delete this file?
 ViewServerFile_DeletFileFromServerJob=Delete file from server
 ViewServerFile_DeleteConfirmation=Delete confirmation
@@ -1,9 +1,47 @@
+AgentFileManager_AllFiles=All Files
+AgentFileManager_ColDate=Date modified
+AgentFileManager_ColName=Name
+AgentFileManager_ColSize=Size
+AgentFileManager_ColType=Type
+AgentFileManager_CreateFolder=&Create folder
+AgentFileManager_CreatingFolder=Creating folder
+AgentFileManager_Delete=&Delete
+AgentFileManager_DirectoryReadError=Cannot read remote directory
+AgentFileManager_Download=&Download...
+AgentFileManager_DownloadFileFromAgent=Download file from agent
+AgentFileManager_DownloadJobError=Error downloading file %s from node %d
+AgentFileManager_DownloadJobTitle=Download file from agent and start tail
+AgentFileManager_Error=Error
+AgentFileManager_FileDownloadError=Error while downloading file %s from node %s [%d]
+AgentFileManager_FolderCreationError=Cannot create folder
+AgentFileManager_MoveError=Cannot move file
+AgentFileManager_MoveFile=Moving file
+AgentFileManager_OpenViewError=Error opening view: %s
+AgentFileManager_PartTitle=File Manager - %s
+AgentFileManager_RefreshFolder=Refresh this folder
+AgentFileManager_Rename=&Rename
+AgentFileManager_RenameError=Cannot rename file
+AgentFileManager_Show=&Show
+AgentFileManager_StartDownloadDialogTitle=Start Download
+AgentFileManager_UploadFile=&Upload file...
+AgentFileManager_UploadFileJobTitle=Upload file to agent
+AgentFileManager_UploadFolder=&Upload folder...
+AgentFileManager_UploadFolderJobTitle=Upload folder to agent
+CreateFolderDialog_Label=New folder name
+CreateFolderDialog_Title=Create Folder
 GetServerFileList_ErrorMessageFileView=Error opening server file list: 
 GetServerFileList_ErrorMessageFileViewTitle=Error opening server file view
 LocalFileSelector_AllFiles=All files
 LocalFileSelector_None=<none>
 LocalFileSelector_SelectFile=Select File
 LocalFileSelector_Tooltip=Select file
+OpenFileManager_Error=Error
+OpenFileManager_ErrorText=Cannot open file manager: %s
+RenameFileDialog_NewName=New file name
+RenameFileDialog_OldName=Old file name
+RenameFileDialog_Title=Rename
+RenameFileDialog_Warning=Warning
+RenameFileDialog_WarningMessage=File name should not contain '/' and '\\' symbols
 SelectServerFileDialog_ColModTime=Modified
 SelectServerFileDialog_ColName=Name
 SelectServerFileDialog_ColSize=Size
@@ -14,6 +52,7 @@ SelectServerFileDialog_Warning=Warning
 SelectServerFileDialog_WarningText=Please select file from the list
 ServerFileSelector_None=<none>
 ServerFileSelector_Tooltip=Select file
+StartClientToAgentFolderUploadDialog_Title=Start Folder Upload
 StartClientToServerFileUploadDialog_LocalFile=Local file
 StartClientToServerFileUploadDialog_RemoteFileName=Remote file name
 StartClientToServerFileUploadDialog_Title=Upload File
@@ -30,10 +69,13 @@ UploadFileToAgent_JobTitle=Initiate file upload to agent
 UploadFileToServer_JobError=Cannot upload file to server
 UploadFileToServer_JobTitle=Upload file to server
 UploadFileToServer_TaskNamePrefix=Upload file 
+ViewAgentFilesProvider_JobError=Cannot read remote directory
+ViewAgentFilesProvider_JobTitle=Reading remote directory
+ViewAgentFilesProvider_Loading=Loading...
 ViewServerFile_DeletAck=Are you sure you want to delete this file?
+ViewServerFile_DeletFileFromServerJob=Delete file from server
 ViewServerFile_DeleteConfirmation=Delete confirmation
 ViewServerFile_DeleteFileOnServerAction=Delete file on server
-ViewServerFile_DeletFileFromServerJob=Delete file from server
 ViewServerFile_ErrorDeleteFileJob=Error while deleting file.
 ViewServerFile_FileName=File name
 ViewServerFile_FileSize=File size
index 1e7aff0..71d278e 100644 (file)
@@ -1,9 +1,47 @@
+AgentFileManager_AllFiles=All Files
+AgentFileManager_ColDate=Date modified
+AgentFileManager_ColName=Name
+AgentFileManager_ColSize=Size
+AgentFileManager_ColType=Type
+AgentFileManager_CreateFolder=&Create folder
+AgentFileManager_CreatingFolder=Creating folder
+AgentFileManager_Delete=&Delete
+AgentFileManager_DirectoryReadError=Cannot read remote directory
+AgentFileManager_Download=&Download...
+AgentFileManager_DownloadFileFromAgent=Download file from agent
+AgentFileManager_DownloadJobError=Error downloading file %s from node %d
+AgentFileManager_DownloadJobTitle=Download file from agent and start tail
+AgentFileManager_Error=Error
+AgentFileManager_FileDownloadError=Error while downloading file %s from node %s [%d]
+AgentFileManager_FolderCreationError=Cannot create folder
+AgentFileManager_MoveError=Cannot move file
+AgentFileManager_MoveFile=Moving file
+AgentFileManager_OpenViewError=Error opening view: %s
+AgentFileManager_PartTitle=File Manager - %s
+AgentFileManager_RefreshFolder=Refresh this folder
+AgentFileManager_Rename=&Rename
+AgentFileManager_RenameError=Cannot rename file
+AgentFileManager_Show=&Show
+AgentFileManager_StartDownloadDialogTitle=Start Download
+AgentFileManager_UploadFile=&Upload file...
+AgentFileManager_UploadFileJobTitle=Upload file to agent
+AgentFileManager_UploadFolder=&Upload folder...
+AgentFileManager_UploadFolderJobTitle=Upload folder to agent
+CreateFolderDialog_Label=New folder name
+CreateFolderDialog_Title=Create Folder
 GetServerFileList_ErrorMessageFileView=Error opening server file list:
 GetServerFileList_ErrorMessageFileViewTitle=Error opening server file view
 LocalFileSelector_AllFiles=Todos los ficheros
 LocalFileSelector_None=<ninguno>
 LocalFileSelector_SelectFile=Seleccionar Fichero
 LocalFileSelector_Tooltip=Seleccionar un fichero
+OpenFileManager_Error=Error
+OpenFileManager_ErrorText=Cannot open file manager: %s
+RenameFileDialog_NewName=New file name
+RenameFileDialog_OldName=Old file name
+RenameFileDialog_Title=Rename
+RenameFileDialog_Warning=Warning
+RenameFileDialog_WarningMessage=File name should not contain '/' and '\\' symbols
 SelectServerFileDialog_ColModTime=Modificado
 SelectServerFileDialog_ColName=Nombre
 SelectServerFileDialog_ColSize=Tama\u00f1o
@@ -14,6 +52,7 @@ SelectServerFileDialog_Warning=Advertencia
 SelectServerFileDialog_WarningText=Seleccionar un fichero de la lista
 ServerFileSelector_None=<ninguno>
 ServerFileSelector_Tooltip=Seleccionar un fichero
+StartClientToAgentFolderUploadDialog_Title=Start Folder Upload
 StartClientToServerFileUploadDialog_LocalFile=Fichero local
 StartClientToServerFileUploadDialog_RemoteFileName=Nombre del fichero remoto
 StartClientToServerFileUploadDialog_Title=Subir fichero
@@ -30,6 +69,9 @@ UploadFileToAgent_JobTitle=Iniciar el env\u00edo del fichero al agente
 UploadFileToServer_JobError=No es posible subir el fichero al servidor
 UploadFileToServer_JobTitle=Subir fichero al servidor
 UploadFileToServer_TaskNamePrefix=Subir fichero
+ViewAgentFilesProvider_JobError=Cannot read remote directory
+ViewAgentFilesProvider_JobTitle=Reading remote directory
+ViewAgentFilesProvider_Loading=Loading...
 ViewServerFile_DeletAck=Are you sure you want to delete this file?
 ViewServerFile_DeletFileFromServerJob=Delete file from server
 ViewServerFile_DeleteConfirmation=Delete confirmation
index 377e209..5c06702 100644 (file)
@@ -1,9 +1,47 @@
+AgentFileManager_AllFiles=All Files
+AgentFileManager_ColDate=Date modified
+AgentFileManager_ColName=Name
+AgentFileManager_ColSize=Size
+AgentFileManager_ColType=Type
+AgentFileManager_CreateFolder=&Create folder
+AgentFileManager_CreatingFolder=Creating folder
+AgentFileManager_Delete=&Delete
+AgentFileManager_DirectoryReadError=Cannot read remote directory
+AgentFileManager_Download=&Download...
+AgentFileManager_DownloadFileFromAgent=Download file from agent
+AgentFileManager_DownloadJobError=Error downloading file %s from node %d
+AgentFileManager_DownloadJobTitle=Download file from agent and start tail
+AgentFileManager_Error=Error
+AgentFileManager_FileDownloadError=Error while downloading file %s from node %s [%d]
+AgentFileManager_FolderCreationError=Cannot create folder
+AgentFileManager_MoveError=Cannot move file
+AgentFileManager_MoveFile=Moving file
+AgentFileManager_OpenViewError=Error opening view: %s
+AgentFileManager_PartTitle=File Manager - %s
+AgentFileManager_RefreshFolder=Refresh this folder
+AgentFileManager_Rename=&Rename
+AgentFileManager_RenameError=Cannot rename file
+AgentFileManager_Show=&Show
+AgentFileManager_StartDownloadDialogTitle=Start Download
+AgentFileManager_UploadFile=&Upload file...
+AgentFileManager_UploadFileJobTitle=Upload file to agent
+AgentFileManager_UploadFolder=&Upload folder...
+AgentFileManager_UploadFolderJobTitle=Upload folder to agent
+CreateFolderDialog_Label=New folder name
+CreateFolderDialog_Title=Create Folder
 GetServerFileList_ErrorMessageFileView=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0442\u043a\u0440\u044b\u0442\u0438\u044f \u0441\u043f\u0438\u0441\u043a\u0430 \u0444\u0430\u0439\u043b\u043e\u0432 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435:
 GetServerFileList_ErrorMessageFileViewTitle=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0442\u043a\u0440\u044b\u0442\u0438\u044f \u0441\u043f\u0438\u0441\u043a\u0430 \u0444\u0430\u0439\u043b\u043e\u0432 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435
 LocalFileSelector_AllFiles=\u0412\u0441\u0435 \u0444\u0430\u0439\u043b\u044b
 LocalFileSelector_None=<\u043d\u0435\u0442>
 LocalFileSelector_SelectFile=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0444\u0430\u0439\u043b
 LocalFileSelector_Tooltip=\u0412\u044b\u0431\u043e\u0440 \u0444\u0430\u0439\u043b\u0430
+OpenFileManager_Error=Error
+OpenFileManager_ErrorText=Cannot open file manager: %s
+RenameFileDialog_NewName=New file name
+RenameFileDialog_OldName=Old file name
+RenameFileDialog_Title=Rename
+RenameFileDialog_Warning=Warning
+RenameFileDialog_WarningMessage=File name should not contain '/' and '\\' symbols
 SelectServerFileDialog_ColModTime=\u0418\u0437\u043c\u0435\u043d\u0435\u043d
 SelectServerFileDialog_ColName=\u0418\u043c\u044f
 SelectServerFileDialog_ColSize=\u0420\u0430\u0437\u043c\u0435\u0440
@@ -14,6 +52,7 @@ SelectServerFileDialog_Warning=\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\
 SelectServerFileDialog_WarningText=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b \u0438\u0437 \u0441\u043f\u0438\u0441\u043a\u0430
 ServerFileSelector_None=<\u043d\u0435\u0442>
 ServerFileSelector_Tooltip=\u0412\u044b\u0431\u043e\u0440 \u0444\u0430\u0439\u043b\u0430
+StartClientToAgentFolderUploadDialog_Title=Start Folder Upload
 StartClientToServerFileUploadDialog_LocalFile=\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0444\u0430\u0439\u043b
 StartClientToServerFileUploadDialog_RemoteFileName=\u0418\u043c\u044f \u0444\u0430\u0439\u043b\u0430 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435
 StartClientToServerFileUploadDialog_Title=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0444\u0430\u0439\u043b\u0430
@@ -30,6 +69,9 @@ UploadFileToAgent_JobTitle=\u0418\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u043
 UploadFileToServer_JobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0444\u0430\u0439\u043b \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440
 UploadFileToServer_JobTitle=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0444\u0430\u0439\u043b\u0430 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440
 UploadFileToServer_TaskNamePrefix=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0444\u0430\u0439\u043b\u0430
+ViewAgentFilesProvider_JobError=Cannot read remote directory
+ViewAgentFilesProvider_JobTitle=Reading remote directory
+ViewAgentFilesProvider_Loading=Loading...
 ViewServerFile_DeletAck=\u0412\u044b\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0444\u0430\u0439\u043b?
 ViewServerFile_DeletFileFromServerJob=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u0430 \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430
 ViewServerFile_DeleteConfirmation=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f
index 8448974..5c94dce 100644 (file)
@@ -1,9 +1,47 @@
+AgentFileManager_AllFiles=All Files
+AgentFileManager_ColDate=Date modified
+AgentFileManager_ColName=Name
+AgentFileManager_ColSize=Size
+AgentFileManager_ColType=Type
+AgentFileManager_CreateFolder=&Create folder
+AgentFileManager_CreatingFolder=Creating folder
+AgentFileManager_Delete=&Delete
+AgentFileManager_DirectoryReadError=Cannot read remote directory
+AgentFileManager_Download=&Download...
+AgentFileManager_DownloadFileFromAgent=Download file from agent
+AgentFileManager_DownloadJobError=Error downloading file %s from node %d
+AgentFileManager_DownloadJobTitle=Download file from agent and start tail
+AgentFileManager_Error=Error
+AgentFileManager_FileDownloadError=Error while downloading file %s from node %s [%d]
+AgentFileManager_FolderCreationError=Cannot create folder
+AgentFileManager_MoveError=Cannot move file
+AgentFileManager_MoveFile=Moving file
+AgentFileManager_OpenViewError=Error opening view: %s
+AgentFileManager_PartTitle=File Manager - %s
+AgentFileManager_RefreshFolder=Refresh this folder
+AgentFileManager_Rename=&Rename
+AgentFileManager_RenameError=Cannot rename file
+AgentFileManager_Show=&Show
+AgentFileManager_StartDownloadDialogTitle=Start Download
+AgentFileManager_UploadFile=&Upload file...
+AgentFileManager_UploadFileJobTitle=Upload file to agent
+AgentFileManager_UploadFolder=&Upload folder...
+AgentFileManager_UploadFolderJobTitle=Upload folder to agent
+CreateFolderDialog_Label=New folder name
+CreateFolderDialog_Title=Create Folder
 GetServerFileList_ErrorMessageFileView=Error opening server file list:
 GetServerFileList_ErrorMessageFileViewTitle=Error opening server file view
 LocalFileSelector_AllFiles=All files
 LocalFileSelector_None=<none>
 LocalFileSelector_SelectFile=Select File
 LocalFileSelector_Tooltip=Select file
+OpenFileManager_Error=Error
+OpenFileManager_ErrorText=Cannot open file manager: %s
+RenameFileDialog_NewName=New file name
+RenameFileDialog_OldName=Old file name
+RenameFileDialog_Title=Rename
+RenameFileDialog_Warning=Warning
+RenameFileDialog_WarningMessage=File name should not contain '/' and '\\' symbols
 SelectServerFileDialog_ColModTime=Modified
 SelectServerFileDialog_ColName=Name
 SelectServerFileDialog_ColSize=Size
@@ -14,6 +52,7 @@ SelectServerFileDialog_Warning=Warning
 SelectServerFileDialog_WarningText=Please select file from the list
 ServerFileSelector_None=<none>
 ServerFileSelector_Tooltip=Select file
+StartClientToAgentFolderUploadDialog_Title=Start Folder Upload
 StartClientToServerFileUploadDialog_LocalFile=Local file
 StartClientToServerFileUploadDialog_RemoteFileName=Remote file name
 StartClientToServerFileUploadDialog_Title=Upload File
@@ -30,6 +69,9 @@ UploadFileToAgent_JobTitle=Initiate file upload to agent
 UploadFileToServer_JobError=Cannot upload file to server
 UploadFileToServer_JobTitle=Upload file to server
 UploadFileToServer_TaskNamePrefix=Upload file
+ViewAgentFilesProvider_JobError=Cannot read remote directory
+ViewAgentFilesProvider_JobTitle=Reading remote directory
+ViewAgentFilesProvider_Loading=Loading...
 ViewServerFile_DeletAck=Are you sure you want to delete this file?
 ViewServerFile_DeletFileFromServerJob=Delete file from server
 ViewServerFile_DeleteConfirmation=Delete confirmation
index 44d847f..36357b6 100644 (file)
@@ -39,7 +39,6 @@ import org.eclipse.jface.util.LocalSelectionTransfer;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.ViewerDropAdapter;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
@@ -139,7 +138,7 @@ public class AgentFileManager extends ViewPart
 
       session = (NXCSession)ConsoleSharedData.getSession();
       objectId = Long.parseLong(site.getSecondaryId());
-      setPartName(String.format("File Manager - %s", session.getObjectName(objectId)));
+      setPartName(String.format(Messages.get().AgentFileManager_PartTitle, session.getObjectName(objectId)));
    }
 
    /*
@@ -170,7 +169,7 @@ public class AgentFileManager extends ViewPart
          }
       });
 
-      final String[] columnNames = { "Name", "Type", "Size", "Date modified" };
+      final String[] columnNames = { Messages.get().AgentFileManager_ColName, Messages.get().AgentFileManager_ColType, Messages.get().AgentFileManager_ColSize, Messages.get().AgentFileManager_ColDate };
       final int[] columnWidths = { 300, 120, 150, 150 };
       viewer = new SortableTreeViewer(content, columnNames, columnWidths, 0, SWT.UP, SortableTableViewer.DEFAULT_STYLE);
       WidgetHelper.restoreTreeViewerSettings(viewer, Activator.getDefault().getDialogSettings(), TABLE_CONFIG_PREFIX);
@@ -311,7 +310,7 @@ public class AgentFileManager extends ViewPart
    private void createActions()
    {
       final IHandlerService handlerService = (IHandlerService)getSite().getService(IHandlerService.class);
-      actionRefreshDirectory = new Action("Refresh this folder", SharedIcons.REFRESH) {
+      actionRefreshDirectory = new Action(Messages.get().AgentFileManager_RefreshFolder, SharedIcons.REFRESH) {
          @Override
          public void run()
          {
@@ -327,7 +326,7 @@ public class AgentFileManager extends ViewPart
          }
       };
 
-      actionUploadFile = new Action("&Upload file...") {
+      actionUploadFile = new Action(Messages.get().AgentFileManager_UploadFile) {
          @Override
          public void run()
          {
@@ -335,7 +334,7 @@ public class AgentFileManager extends ViewPart
          }
       };
       
-      actionUploadFolder = new Action("&Upload folder...") {
+      actionUploadFolder = new Action(Messages.get().AgentFileManager_UploadFolder) {
          @Override
          public void run()
          {
@@ -343,7 +342,7 @@ public class AgentFileManager extends ViewPart
          }
       };
 
-      actionDelete = new Action("&Delete", SharedIcons.DELETE_OBJECT) {
+      actionDelete = new Action(Messages.get().AgentFileManager_Delete, SharedIcons.DELETE_OBJECT) {
          @Override
          public void run()
          {
@@ -351,7 +350,7 @@ public class AgentFileManager extends ViewPart
          }
       };
 
-      actionRename = new Action("&Rename") {
+      actionRename = new Action(Messages.get().AgentFileManager_Rename) {
          @Override
          public void run()
          {
@@ -372,7 +371,7 @@ public class AgentFileManager extends ViewPart
       final ActionHandler showFilterHandler = new ActionHandler(actionShowFilter);
       handlerService.activateHandler(actionShowFilter.getActionDefinitionId(), showFilterHandler);
 
-      actionDownloadFile = new Action("&Download...") {
+      actionDownloadFile = new Action(Messages.get().AgentFileManager_Download) {
          @Override
          public void run()
          {
@@ -380,7 +379,7 @@ public class AgentFileManager extends ViewPart
          }
       };
 
-      actionTailFile = new Action("&Show") {
+      actionTailFile = new Action(Messages.get().AgentFileManager_Show) {
          @Override
          public void run()
          {
@@ -388,7 +387,7 @@ public class AgentFileManager extends ViewPart
          }
       };
       
-      actionCreateDirectory = new Action("&Create folder") {
+      actionCreateDirectory = new Action(Messages.get().AgentFileManager_CreateFolder) {
          @Override
          public void run()
          {
@@ -505,7 +504,7 @@ public class AgentFileManager extends ViewPart
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
-            files = session.listAgentFiles(null, "/", objectId);
+            files = session.listAgentFiles(null, "/", objectId); //$NON-NLS-1$
             runInUIThread(new Runnable() {
                @Override
                public void run()
@@ -581,11 +580,11 @@ public class AgentFileManager extends ViewPart
       if (dlg.open() == Window.OK)
       {
          final NXCSession session = (NXCSession)ConsoleSharedData.getSession();
-         new ConsoleJob("Upload file to agent", null, Activator.PLUGIN_ID, null) {
+         new ConsoleJob(Messages.get().AgentFileManager_UploadFileJobTitle, null, Activator.PLUGIN_ID, null) {
             @Override
             protected void runInternal(final IProgressMonitor monitor) throws Exception
             {
-               session.uploadLocalFileToAgent(dlg.getLocalFile(), upladFolder.getFullName()+"/"+dlg.getRemoteFileName(), objectId, new ProgressListener() {
+               session.uploadLocalFileToAgent(dlg.getLocalFile(), upladFolder.getFullName()+"/"+dlg.getRemoteFileName(), objectId, new ProgressListener() { //$NON-NLS-1$
                   private long prevWorkDone = 0;
 
                   @Override
@@ -641,13 +640,13 @@ public class AgentFileManager extends ViewPart
       if (dlg.open() == Window.OK)
       {
          final NXCSession session = (NXCSession)ConsoleSharedData.getSession();
-         new ConsoleJob("Upload file to agent", null, Activator.PLUGIN_ID, null) {
+         new ConsoleJob(Messages.get().AgentFileManager_UploadFolderJobTitle, null, Activator.PLUGIN_ID, null) {
             @Override
             protected void runInternal(final IProgressMonitor monitor) throws Exception
             {
                File folder = dlg.getLocalFile();
-               session.createFolderOnAgent(upladFolder.getFullName()+"/"+dlg.getRemoteFileName(), objectId);
-               listFilesForFolder(folder, upladFolder.getFullName()+"/"+dlg.getRemoteFileName(), monitor);
+               session.createFolderOnAgent(upladFolder.getFullName()+"/"+dlg.getRemoteFileName(), objectId); //$NON-NLS-1$
+               listFilesForFolder(folder, upladFolder.getFullName()+"/"+dlg.getRemoteFileName(), monitor); //$NON-NLS-1$
                
                upladFolder.setChildren(session.listAgentFiles(upladFolder, upladFolder.getFullName(), objectId));
                runInUIThread(new Runnable() {
@@ -683,12 +682,12 @@ public class AgentFileManager extends ViewPart
       {
           if (fileEntry.isDirectory()) 
           {
-             session.createFolderOnAgent(upladFolder+"/"+fileEntry.getName(), objectId);
-             listFilesForFolder(fileEntry, upladFolder+"/"+fileEntry.getName(), monitor);
+             session.createFolderOnAgent(upladFolder+"/"+fileEntry.getName(), objectId); //$NON-NLS-1$
+             listFilesForFolder(fileEntry, upladFolder+"/"+fileEntry.getName(), monitor); //$NON-NLS-1$
           } 
           else 
           {
-             session.uploadLocalFileToAgent(fileEntry, upladFolder+"/"+fileEntry.getName(), objectId, new ProgressListener() {
+             session.uploadLocalFileToAgent(fileEntry, upladFolder+"/"+fileEntry.getName(), objectId, new ProgressListener() { //$NON-NLS-1$
                 private long prevWorkDone = 0;
 
                 @Override
@@ -768,11 +767,11 @@ public class AgentFileManager extends ViewPart
 
       final ServerFile sf = ((ServerFile)objects[0]);
 
-      ConsoleJob job = new ConsoleJob("Download file from agent and start tail", null, Activator.PLUGIN_ID, null) {
+      ConsoleJob job = new ConsoleJob(Messages.get().AgentFileManager_DownloadJobTitle, null, Activator.PLUGIN_ID, null) {
          @Override
          protected String getErrorMessage()
          {
-            return String.format("Error while downloading %s file from %d node.", sf.getFullName(), objectId);
+            return String.format(Messages.get().AgentFileManager_DownloadJobError, sf.getFullName(), objectId);
          }
 
          @Override
@@ -793,8 +792,8 @@ public class AgentFileManager extends ViewPart
                   }
                   catch(Exception e)
                   {
-                     MessageDialogHelper.openError(window.getShell(), "Error opening view.",
-                           String.format("Error opening view: %s", e.getLocalizedMessage()));
+                     MessageDialogHelper.openError(window.getShell(), Messages.get().AgentFileManager_Error,
+                           String.format(Messages.get().AgentFileManager_OpenViewError, e.getLocalizedMessage()));
                   }
                }
             });
@@ -818,10 +817,10 @@ public class AgentFileManager extends ViewPart
       do
       {
          FileDialog fd = new FileDialog(getSite().getShell(), SWT.SAVE);
-         fd.setText("Select how to save file or directory");
-         String[] filterExtensions = { "*.*" };
+         fd.setText(Messages.get().AgentFileManager_StartDownloadDialogTitle);
+         String[] filterExtensions = { "*.*" }; //$NON-NLS-1$
          fd.setFilterExtensions(filterExtensions);
-         String[] filterNames = { "ALL" };
+         String[] filterNames = { Messages.get().AgentFileManager_AllFiles };
          fd.setFilterNames(filterNames);
          fd.setFileName(sf.getName());
          selected = fd.open();
@@ -846,7 +845,7 @@ public class AgentFileManager extends ViewPart
             @Override
             protected String getErrorMessage()
             {
-               return "Error while retrieving children of server file";
+               return Messages.get().AgentFileManager_DirectoryReadError;
             }
          };
          job.setUser(false);
@@ -875,11 +874,11 @@ public class AgentFileManager extends ViewPart
       {
          if(files[i].isDirectory())
          {
-            downloadDir(files[i], localFileName+"/"+sf.getName());
+            downloadDir(files[i], localFileName + "/" + sf.getName()); //$NON-NLS-1$
          }
          else
          {
-            downloadFile(localFileName+"/"+files[i].getName(), files[i].getFullName());
+            downloadFile(localFileName + "/" + files[i].getName(), files[i].getFullName()); //$NON-NLS-1$
          }
       }
    }
@@ -889,7 +888,7 @@ public class AgentFileManager extends ViewPart
     */
    private void downloadFile(final String localName, final String remoteName)
    {
-      ConsoleJob job = new ConsoleJob("Download file from agent", null, Activator.PLUGIN_ID, null) {
+      ConsoleJob job = new ConsoleJob(Messages.get().AgentFileManager_DownloadFileFromAgent, null, Activator.PLUGIN_ID, null) {
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
@@ -911,7 +910,7 @@ public class AgentFileManager extends ViewPart
          @Override
          protected String getErrorMessage()
          {
-            return String.format("Error while downloading file %s from node %s [%d]", remoteName, session.getObjectName(objectId), objectId);
+            return String.format(Messages.get().AgentFileManager_FileDownloadError, remoteName, session.getObjectName(objectId), objectId);
          }
       };
       job.start();
@@ -938,14 +937,14 @@ public class AgentFileManager extends ViewPart
          @Override
          protected String getErrorMessage()
          {
-            return "Error while rename file job";
+            return Messages.get().AgentFileManager_RenameError;
          }
 
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
             final ServerFile sf = (ServerFile)objects[0];
-            session.renameAgentFile(objectId, sf.getFullName(), sf.getParent().getFullName() + "/" + newName);
+            session.renameAgentFile(objectId, sf.getFullName(), sf.getParent().getFullName() + "/" + newName); //$NON-NLS-1$
 
             runInUIThread(new Runnable() {
                @Override
@@ -964,17 +963,17 @@ public class AgentFileManager extends ViewPart
     */
    private void moveFile(final ServerFile target, final ServerFile object)
    {
-      new ConsoleJob("Move file job", this, Activator.PLUGIN_ID, Activator.PLUGIN_ID) {
+      new ConsoleJob(Messages.get().AgentFileManager_MoveFile, this, Activator.PLUGIN_ID, Activator.PLUGIN_ID) {
          @Override
          protected String getErrorMessage()
          {
-            return "Error while move file job";
+            return Messages.get().AgentFileManager_MoveError;
          }
 
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
-            session.renameAgentFile(objectId, object.getFullName(), target.getFullName() + "/" + object.getName());
+            session.renameAgentFile(objectId, object.getFullName(), target.getFullName() + "/" + object.getName()); //$NON-NLS-1$
 
             runInUIThread(new Runnable() {
                @Override
@@ -1010,17 +1009,17 @@ public class AgentFileManager extends ViewPart
       
       final String newFolder = dlg.getNewName();
       
-      new ConsoleJob("Create folder job", this, Activator.PLUGIN_ID, Activator.PLUGIN_ID) {
+      new ConsoleJob(Messages.get().AgentFileManager_CreatingFolder, this, Activator.PLUGIN_ID, Activator.PLUGIN_ID) {
          @Override
          protected String getErrorMessage()
          {
-            return "Error while create folder job";
+            return Messages.get().AgentFileManager_FolderCreationError;
          }
 
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
-            session.createFolderOnAgent(parentFolder.getFullName()+"/"+newFolder, objectId);
+            session.createFolderOnAgent(parentFolder.getFullName() + "/" + newFolder, objectId); //$NON-NLS-1$
             parentFolder.setChildren(session.listAgentFiles(parentFolder, parentFolder.getFullName(), objectId));
 
             runInUIThread(new Runnable() {
index 76048fd..e6b0f3a 100644 (file)
@@ -67,9 +67,9 @@ public class ServerFileLabelProvider extends LabelProvider implements ITableLabe
                        case ViewServerFile.COLUMN_TYPE:
                                return ((ServerFile)element).getExtension();
                        case ViewServerFile.COLUMN_SIZE:
-                               return (((ServerFile)element).isDirectory() || ((ServerFile)element).isPlaceholder()) ? "" : Long.toString(((ServerFile)element).getSize());
+                               return (((ServerFile)element).isDirectory() || ((ServerFile)element).isPlaceholder()) ? "" : Long.toString(((ServerFile)element).getSize()); //$NON-NLS-1$
                        case ViewServerFile.COLUMN_MODIFYED:
-                               return (((ServerFile)element).isPlaceholder() || ((ServerFile)element).getModifyicationTime().getTime() == 0) ? "" : RegionalSettings.getDateTimeFormat().format(((ServerFile)element).getModifyicationTime());
+                               return (((ServerFile)element).isPlaceholder() || ((ServerFile)element).getModifyicationTime().getTime() == 0) ? "" : RegionalSettings.getDateTimeFormat().format(((ServerFile)element).getModifyicationTime()); //$NON-NLS-1$
                }
                return null;
        }
index 12cb56e..043f3b8 100644 (file)
@@ -56,7 +56,7 @@ public class ViewAgentFilesProvider implements ITreeContentProvider
        {
           if(((ServerFile)parentElement).getChildren() == null)
           {
-         ConsoleJob job = new ConsoleJob(Messages.get().SelectServerFileDialog_JobTitle, null, Activator.PLUGIN_ID, null) {
+         ConsoleJob job = new ConsoleJob(Messages.get().ViewAgentFilesProvider_JobTitle, null, Activator.PLUGIN_ID, null) {
             @Override
             protected void runInternal(IProgressMonitor monitor) throws Exception
             {
@@ -74,12 +74,12 @@ public class ViewAgentFilesProvider implements ITreeContentProvider
             @Override
             protected String getErrorMessage()
             {
-               return "Error while retrieving children of server file";
+               return Messages.get().ViewAgentFilesProvider_JobError;
             }
          };
          job.setUser(false);
          job.start();
-         return new ServerFile[] { new ServerFile("Loading...", ServerFile.PLACEHOLDER, (ServerFile)parentElement, ((ServerFile)parentElement).getNodeId()) };
+         return new ServerFile[] { new ServerFile(Messages.get().ViewAgentFilesProvider_Loading, ServerFile.PLACEHOLDER, (ServerFile)parentElement, ((ServerFile)parentElement).getNodeId()) };
           }
                return ((ServerFile)parentElement).getChildren();
        }
@@ -122,7 +122,4 @@ public class ViewAgentFilesProvider implements ITreeContentProvider
             list.add(e);      
       return list.toArray();
    }
-   
-   
-
 }
index 3196465..590ea94 100755 (executable)
@@ -4,7 +4,7 @@ import sys
 import os
 import collections
 
-locales = ['cs', 'es', 'ru', 'zh_CN']
+locales = ['cs', 'de', 'es', 'ru', 'zh_CN']
 
 def readPropertyFile(name):
     data = {}
index aa99fb0..4a47a95 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NetXMS FileManager
 Bundle-SymbolicName: org.netxms.ui.eclipse.filemanager;singleton:=true
-Bundle-Version: 1.2.17
+Bundle-Version: 2.0.0
 Bundle-Activator: org.netxms.ui.eclipse.filemanager.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
index 99c39e7..9728536 100644 (file)
@@ -1,13 +1,13 @@
 #Properties file for org.netxms.ui.eclipse.filemanager
+action.label.ServerFileList = Server File List
 action.label.UploadFile = Upload file...
+action.label.UploadToServer = Upload file to server...
+action.tooltip.ServerFileList = Show list with files stored by netXMS on server side
+action.tooltip.UploadToServer = Upload local file to server's file store
+actionSet.label.FileManager = File Manager Action Set
+category.Views = Views
 command.description.UploadToServer = Upload local file to server
 command.description.ServerFileList = Open server file list
 command.name.UploadToServer = Upload file to server...
 command.name.ServerFileList = Open server file list
-actionSet.label.FileManager = File Manager Action Set
-action.label.UploadToServer = Upload file to server...
-action.label.ServerFileList = Server File List
-action.tooltip.UploadToServer = Upload local file to server's file store
-action.tooltip.ServerFileList = Show list with files stored by netXMS on server side
 view.ServerFileList.name = Server File List
-category.Views = Views
\ No newline at end of file
diff --git a/webui/webapp/FileManager/OSGI-INF/l10n/bundle_de.properties b/webui/webapp/FileManager/OSGI-INF/l10n/bundle_de.properties
new file mode 100644 (file)
index 0000000..a94000a
--- /dev/null
@@ -0,0 +1,12 @@
+action.label.ServerFileList= Server File List
+action.label.UploadFile= Upload file...
+action.label.UploadToServer= Upload file to server...
+action.tooltip.ServerFileList= Show list with files stored by netXMS on server side
+action.tooltip.UploadToServer= Upload local file to server's file store
+actionSet.label.FileManager= File Manager Action Set
+category.Views= Views
+command.description.ServerFileList= Open server file list
+command.description.UploadToServer= Upload local file to server
+command.name.ServerFileList= Open server file list
+command.name.UploadToServer= Upload file to server...
+view.ServerFileList.name= Server File List
index c0d2d62..8495cf3 100644 (file)
@@ -8,13 +8,51 @@ import org.eclipse.swt.widgets.Display;
 public class Messages extends NLS
 {
        private static final String BUNDLE_NAME = "org.netxms.ui.eclipse.filemanager.messages"; //$NON-NLS-1$
-       public String GetServerFileList_ErrorMessageFileView;
+       public String AgentFileManager_AllFiles;
+   public String AgentFileManager_ColDate;
+   public String AgentFileManager_ColName;
+   public String AgentFileManager_ColSize;
+   public String AgentFileManager_ColType;
+   public String AgentFileManager_CreateFolder;
+   public String AgentFileManager_CreatingFolder;
+   public String AgentFileManager_Delete;
+   public String AgentFileManager_DirectoryReadError;
+   public String AgentFileManager_Download;
+   public String AgentFileManager_DownloadFileFromAgent;
+   public String AgentFileManager_DownloadJobError;
+   public String AgentFileManager_DownloadJobTitle;
+   public String AgentFileManager_Error;
+   public String AgentFileManager_FileDownloadError;
+   public String AgentFileManager_FolderCreationError;
+   public String AgentFileManager_MoveError;
+   public String AgentFileManager_MoveFile;
+   public String AgentFileManager_OpenViewError;
+   public String AgentFileManager_PartTitle;
+   public String AgentFileManager_RefreshFolder;
+   public String AgentFileManager_Rename;
+   public String AgentFileManager_RenameError;
+   public String AgentFileManager_Show;
+   public String AgentFileManager_StartDownloadDialogTitle;
+   public String AgentFileManager_UploadFile;
+   public String AgentFileManager_UploadFileJobTitle;
+   public String AgentFileManager_UploadFolder;
+   public String AgentFileManager_UploadFolderJobTitle;
+   public String CreateFolderDialog_Label;
+   public String CreateFolderDialog_Title;
+   public String GetServerFileList_ErrorMessageFileView;
    public String GetServerFileList_ErrorMessageFileViewTitle;
    public String LocalFileSelector_AllFiles;
        public String LocalFileSelector_None;
        public String LocalFileSelector_SelectFile;
        public String LocalFileSelector_Tooltip;
-       public String SelectServerFileDialog_ColModTime;
+   public String OpenFileManager_Error;
+   public String OpenFileManager_ErrorText;
+       public String RenameFileDialog_NewName;
+   public String RenameFileDialog_OldName;
+   public String RenameFileDialog_Title;
+   public String RenameFileDialog_Warning;
+   public String RenameFileDialog_WarningMessage;
+   public String SelectServerFileDialog_ColModTime;
        public String SelectServerFileDialog_ColName;
        public String SelectServerFileDialog_ColSize;
        public String SelectServerFileDialog_JobError;
@@ -24,7 +62,8 @@ public class Messages extends NLS
        public String SelectServerFileDialog_WarningText;
        public String ServerFileSelector_None;
        public String ServerFileSelector_Tooltip;
-       public String StartClientToServerFileUploadDialog_LocalFile;
+       public String StartClientToAgentFolderUploadDialog_Title;
+   public String StartClientToServerFileUploadDialog_LocalFile;
        public String StartClientToServerFileUploadDialog_RemoteFileName;
        public String StartClientToServerFileUploadDialog_Title;
        public String StartClientToServerFileUploadDialog_Warning;
@@ -40,7 +79,10 @@ public class Messages extends NLS
        public String UploadFileToServer_JobError;
        public String UploadFileToServer_JobTitle;
        public String UploadFileToServer_TaskNamePrefix;
-       public String ViewServerFile_DeletAck;
+       public String ViewAgentFilesProvider_JobError;
+   public String ViewAgentFilesProvider_JobTitle;
+   public String ViewAgentFilesProvider_Loading;
+   public String ViewServerFile_DeletAck;
    public String ViewServerFile_DeleteConfirmation;
    public String ViewServerFile_DeleteFileOnServerAction;
    public String ViewServerFile_DeletFileFromServerJob;
index cdbd3b2..2627e1f 100644 (file)
@@ -27,6 +27,7 @@ import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.netxms.client.objects.AbstractObject;
+import org.netxms.ui.eclipse.filemanager.Messages;
 import org.netxms.ui.eclipse.filemanager.views.AgentFileManager;
 import org.netxms.ui.eclipse.tools.MessageDialogHelper;
 
@@ -61,7 +62,8 @@ public class OpenFileManager implements IObjectActionDelegate
          }
          catch(PartInitException e)
          {
-            MessageDialogHelper.openError(window.getShell(), "Show node file list error", "Error: " + e.getMessage());
+            MessageDialogHelper.openError(window.getShell(), 
+                  Messages.get().OpenFileManager_Error, String.format(Messages.get().OpenFileManager_ErrorText, e.getMessage()));
          }
       }
    }
index d236703..34dbf1d 100644 (file)
@@ -85,7 +85,7 @@ public class UploadFileToAgent implements IObjectActionDelegate
                                   String remoteFileName = dlg.getRemoteFileName();
                                   if(!remoteFileName.isEmpty())
                                   {
-                                     if(remoteFileName.endsWith("/") || remoteFileName.endsWith("\\"))
+                                     if(remoteFileName.endsWith("/") || remoteFileName.endsWith("\\")) //$NON-NLS-1$ //$NON-NLS-2$
                                      {
                                         remoteFileName += dlg.getServerFile().getName();
                                      }
index fd7558a..28b5575 100644 (file)
@@ -1,6 +1,6 @@
 /**
  * NetXMS - open source network management system
- * Copyright (C) 2003-2011 Victor Kirhenshtein
+ * Copyright (C) 2003-2014 Victor Kirhenshtein
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.netxms.ui.eclipse.filemanager.Messages;
-import org.netxms.ui.eclipse.tools.MessageDialogHelper;
 import org.netxms.ui.eclipse.tools.WidgetHelper;
 import org.netxms.ui.eclipse.widgets.LabeledText;
 
@@ -54,7 +53,7 @@ public class CreateFolderDialog extends Dialog
        protected void configureShell(Shell newShell)
        {
                super.configureShell(newShell);
-               newShell.setText(Messages.get().StartClientToServerFileUploadDialog_Title);
+               newShell.setText(Messages.get().CreateFolderDialog_Title);
        }
 
        /* (non-Javadoc)
@@ -72,7 +71,7 @@ public class CreateFolderDialog extends Dialog
                dialogArea.setLayout(layout);
       
                textNewDirectoryName = new LabeledText(dialogArea, SWT.NONE);
-               textNewDirectoryName.setLabel("New folder name");
+               textNewDirectoryName.setLabel(Messages.get().CreateFolderDialog_Label);
       GridData gd = new GridData();
       gd.horizontalAlignment = SWT.FILL;
       gd.grabExcessHorizontalSpace = true;
index ae25927..9426d58 100644 (file)
@@ -1,6 +1,6 @@
 /**
  * NetXMS - open source network management system
- * Copyright (C) 2003-2011 Victor Kirhenshtein
+ * Copyright (C) 2003-2014 Victor Kirhenshtein
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ public class RenameFileDialog extends Dialog
        protected void configureShell(Shell newShell)
        {
                super.configureShell(newShell);
-               newShell.setText(Messages.get().StartClientToServerFileUploadDialog_Title);
+               newShell.setText(Messages.get().RenameFileDialog_Title);
        }
 
        /* (non-Javadoc)
@@ -77,7 +77,7 @@ public class RenameFileDialog extends Dialog
                GridData gd;
                
                textOldFileName = new LabeledText(dialogArea, SWT.NONE);
-               textOldFileName.setLabel("Old file name");
+               textOldFileName.setLabel(Messages.get().RenameFileDialog_OldName);
                gd = new GridData();
                gd.horizontalAlignment = SWT.FILL;
                gd.grabExcessHorizontalSpace = true;
@@ -86,7 +86,7 @@ public class RenameFileDialog extends Dialog
       textOldFileName.setEditable(false);
       
       textNewFileName = new LabeledText(dialogArea, SWT.NONE);
-      textNewFileName.setLabel("New file name");
+      textNewFileName.setLabel(Messages.get().RenameFileDialog_NewName);
       gd = new GridData();
       gd.horizontalAlignment = SWT.FILL;
       gd.grabExcessHorizontalSpace = true;
@@ -102,9 +102,9 @@ public class RenameFileDialog extends Dialog
        protected void okPressed()
        {
           newFileName = textNewFileName.getText();
-          if(newFileName.contains("/") || newFileName.contains("\\"))
+          if (newFileName.contains("/") || newFileName.contains("\\")) //$NON-NLS-1$ //$NON-NLS-2$
           {
-             MessageDialogHelper.openWarning(getShell(), "Rename file error", "File name should not contain '/' and '\\' symbols");
+             MessageDialogHelper.openWarning(getShell(), Messages.get().RenameFileDialog_Warning, Messages.get().RenameFileDialog_WarningMessage);
              return;
           }
              
index bf77e4c..01bdbc2 100644 (file)
@@ -1,9 +1,47 @@
+AgentFileManager_AllFiles=All Files
+AgentFileManager_ColDate=Date modified
+AgentFileManager_ColName=Name
+AgentFileManager_ColSize=Size
+AgentFileManager_ColType=Type
+AgentFileManager_CreateFolder=&Create folder
+AgentFileManager_CreatingFolder=Creating folder
+AgentFileManager_Delete=&Delete
+AgentFileManager_DirectoryReadError=Cannot read remote directory
+AgentFileManager_Download=&Download...
+AgentFileManager_DownloadFileFromAgent=Download file from agent
+AgentFileManager_DownloadJobError=Error downloading file %s from node %d
+AgentFileManager_DownloadJobTitle=Download file from agent and start tail
+AgentFileManager_Error=Error
+AgentFileManager_FileDownloadError=Error while downloading file %s from node %s [%d]
+AgentFileManager_FolderCreationError=Cannot create folder
+AgentFileManager_MoveError=Cannot move file
+AgentFileManager_MoveFile=Moving file
+AgentFileManager_OpenViewError=Error opening view: %s
+AgentFileManager_PartTitle=File Manager - %s
+AgentFileManager_RefreshFolder=Refresh this folder
+AgentFileManager_Rename=&Rename
+AgentFileManager_RenameError=Cannot rename file
+AgentFileManager_Show=&Show
+AgentFileManager_StartDownloadDialogTitle=Start Download
+AgentFileManager_UploadFile=&Upload file...
+AgentFileManager_UploadFileJobTitle=Upload file to agent
+AgentFileManager_UploadFolder=&Upload folder...
+AgentFileManager_UploadFolderJobTitle=Upload folder to agent
+CreateFolderDialog_Label=New folder name
+CreateFolderDialog_Title=Create Folder
 GetServerFileList_ErrorMessageFileView=Error opening server file list: 
 GetServerFileList_ErrorMessageFileViewTitle=Error opening server file view
 LocalFileSelector_AllFiles=All files
 LocalFileSelector_None=<none>
 LocalFileSelector_SelectFile=Select File
 LocalFileSelector_Tooltip=Select file
+OpenFileManager_Error=Error
+OpenFileManager_ErrorText=Cannot open file manager: %s
+RenameFileDialog_NewName=New file name
+RenameFileDialog_OldName=Old file name
+RenameFileDialog_Title=Rename
+RenameFileDialog_Warning=Warning
+RenameFileDialog_WarningMessage=File name should not contain '/' and '\\' symbols
 SelectServerFileDialog_ColModTime=Modified
 SelectServerFileDialog_ColName=Name
 SelectServerFileDialog_ColSize=Size
@@ -14,6 +52,7 @@ SelectServerFileDialog_Warning=Warning
 SelectServerFileDialog_WarningText=Please select file from the list
 ServerFileSelector_None=<none>
 ServerFileSelector_Tooltip=Select file
+StartClientToAgentFolderUploadDialog_Title=Start Folder Upload
 StartClientToServerFileUploadDialog_LocalFile=Local file
 StartClientToServerFileUploadDialog_RemoteFileName=Remote file name
 StartClientToServerFileUploadDialog_Title=Upload File
@@ -30,6 +69,9 @@ UploadFileToAgent_JobTitle=Initiate file upload to agent
 UploadFileToServer_JobError=Cannot upload file to server
 UploadFileToServer_JobTitle=Upload file to server
 UploadFileToServer_TaskNamePrefix=Upload file 
+ViewAgentFilesProvider_JobError=Cannot read remote directory
+ViewAgentFilesProvider_JobTitle=Reading remote directory
+ViewAgentFilesProvider_Loading=Loading...
 ViewServerFile_DeletAck=Are you sure you want to delete this file?
 ViewServerFile_DeleteConfirmation=Delete confirmation
 ViewServerFile_DeleteFileOnServerAction=Delete file on server
index 4d01ab5..88ae5ae 100644 (file)
@@ -1,9 +1,47 @@
+AgentFileManager_AllFiles=All Files
+AgentFileManager_ColDate=Date modified
+AgentFileManager_ColName=Name
+AgentFileManager_ColSize=Size
+AgentFileManager_ColType=Type
+AgentFileManager_CreateFolder=&Create folder
+AgentFileManager_CreatingFolder=Creating folder
+AgentFileManager_Delete=&Delete
+AgentFileManager_DirectoryReadError=Cannot read remote directory
+AgentFileManager_Download=&Download...
+AgentFileManager_DownloadFileFromAgent=Download file from agent
+AgentFileManager_DownloadJobError=Error downloading file %s from node %d
+AgentFileManager_DownloadJobTitle=Download file from agent and start tail
+AgentFileManager_Error=Error
+AgentFileManager_FileDownloadError=Error while downloading file %s from node %s [%d]
+AgentFileManager_FolderCreationError=Cannot create folder
+AgentFileManager_MoveError=Cannot move file
+AgentFileManager_MoveFile=Moving file
+AgentFileManager_OpenViewError=Error opening view: %s
+AgentFileManager_PartTitle=File Manager - %s
+AgentFileManager_RefreshFolder=Refresh this folder
+AgentFileManager_Rename=&Rename
+AgentFileManager_RenameError=Cannot rename file
+AgentFileManager_Show=&Show
+AgentFileManager_StartDownloadDialogTitle=Start Download
+AgentFileManager_UploadFile=&Upload file...
+AgentFileManager_UploadFileJobTitle=Upload file to agent
+AgentFileManager_UploadFolder=&Upload folder...
+AgentFileManager_UploadFolderJobTitle=Upload folder to agent
+CreateFolderDialog_Label=New folder name
+CreateFolderDialog_Title=Create Folder
 GetServerFileList_ErrorMessageFileView=Error opening server file list:
 GetServerFileList_ErrorMessageFileViewTitle=Error opening server file view
 LocalFileSelector_AllFiles=V\u0161echny soubory
 LocalFileSelector_None=<\u017E\u00E1dn\u00FD>
 LocalFileSelector_SelectFile=Vybrat soubor
 LocalFileSelector_Tooltip=Vybrat soubor
+OpenFileManager_Error=Error
+OpenFileManager_ErrorText=Cannot open file manager: %s
+RenameFileDialog_NewName=New file name
+RenameFileDialog_OldName=Old file name
+RenameFileDialog_Title=Rename
+RenameFileDialog_Warning=Warning
+RenameFileDialog_WarningMessage=File name should not contain '/' and '\\' symbols
 SelectServerFileDialog_ColModTime=Modifikovan\u00FD
 SelectServerFileDialog_ColName=N\u00E1zev
 SelectServerFileDialog_ColSize=Velikost
@@ -14,6 +52,7 @@ SelectServerFileDialog_Warning=Varov\u00E1n\u00ED
 SelectServerFileDialog_WarningText=Pros\u00EDm vyberte soubor ze seznamu
 ServerFileSelector_None=<\u017E\u00E1dn\u00FD>
 ServerFileSelector_Tooltip=Vybrat soubor
+StartClientToAgentFolderUploadDialog_Title=Start Folder Upload
 StartClientToServerFileUploadDialog_LocalFile=Lok\u00E1ln\u00ED soubor
 StartClientToServerFileUploadDialog_RemoteFileName=N\u00E1zev vzd\u00E1len\u00E9ho souboru
 StartClientToServerFileUploadDialog_Title=Nahr\u00E1t soubor
@@ -30,6 +69,9 @@ UploadFileToAgent_JobTitle=Inicializovat nahr\u00E1n\u00ED souboru do agenta
 UploadFileToServer_JobError=Nelze nahr\u00E1t soubor na server
 UploadFileToServer_JobTitle=Nahr\u00E1t soubor na server
 UploadFileToServer_TaskNamePrefix=Nahr\u00E1t soubor
+ViewAgentFilesProvider_JobError=Cannot read remote directory
+ViewAgentFilesProvider_JobTitle=Reading remote directory
+ViewAgentFilesProvider_Loading=Loading...
 ViewServerFile_DeletAck=Are you sure you want to delete this file?
 ViewServerFile_DeletFileFromServerJob=Delete file from server
 ViewServerFile_DeleteConfirmation=Delete confirmation
@@ -1,9 +1,47 @@
+AgentFileManager_AllFiles=All Files
+AgentFileManager_ColDate=Date modified
+AgentFileManager_ColName=Name
+AgentFileManager_ColSize=Size
+AgentFileManager_ColType=Type
+AgentFileManager_CreateFolder=&Create folder
+AgentFileManager_CreatingFolder=Creating folder
+AgentFileManager_Delete=&Delete
+AgentFileManager_DirectoryReadError=Cannot read remote directory
+AgentFileManager_Download=&Download...
+AgentFileManager_DownloadFileFromAgent=Download file from agent
+AgentFileManager_DownloadJobError=Error downloading file %s from node %d
+AgentFileManager_DownloadJobTitle=Download file from agent and start tail
+AgentFileManager_Error=Error
+AgentFileManager_FileDownloadError=Error while downloading file %s from node %s [%d]
+AgentFileManager_FolderCreationError=Cannot create folder
+AgentFileManager_MoveError=Cannot move file
+AgentFileManager_MoveFile=Moving file
+AgentFileManager_OpenViewError=Error opening view: %s
+AgentFileManager_PartTitle=File Manager - %s
+AgentFileManager_RefreshFolder=Refresh this folder
+AgentFileManager_Rename=&Rename
+AgentFileManager_RenameError=Cannot rename file
+AgentFileManager_Show=&Show
+AgentFileManager_StartDownloadDialogTitle=Start Download
+AgentFileManager_UploadFile=&Upload file...
+AgentFileManager_UploadFileJobTitle=Upload file to agent
+AgentFileManager_UploadFolder=&Upload folder...
+AgentFileManager_UploadFolderJobTitle=Upload folder to agent
+CreateFolderDialog_Label=New folder name
+CreateFolderDialog_Title=Create Folder
 GetServerFileList_ErrorMessageFileView=Error opening server file list: 
 GetServerFileList_ErrorMessageFileViewTitle=Error opening server file view
 LocalFileSelector_AllFiles=All files
 LocalFileSelector_None=<none>
 LocalFileSelector_SelectFile=Select File
 LocalFileSelector_Tooltip=Select file
+OpenFileManager_Error=Error
+OpenFileManager_ErrorText=Cannot open file manager: %s
+RenameFileDialog_NewName=New file name
+RenameFileDialog_OldName=Old file name
+RenameFileDialog_Title=Rename
+RenameFileDialog_Warning=Warning
+RenameFileDialog_WarningMessage=File name should not contain '/' and '\\' symbols
 SelectServerFileDialog_ColModTime=Modified
 SelectServerFileDialog_ColName=Name
 SelectServerFileDialog_ColSize=Size
@@ -14,6 +52,7 @@ SelectServerFileDialog_Warning=Warning
 SelectServerFileDialog_WarningText=Please select file from the list
 ServerFileSelector_None=<none>
 ServerFileSelector_Tooltip=Select file
+StartClientToAgentFolderUploadDialog_Title=Start Folder Upload
 StartClientToServerFileUploadDialog_LocalFile=Local file
 StartClientToServerFileUploadDialog_RemoteFileName=Remote file name
 StartClientToServerFileUploadDialog_Title=Upload File
@@ -30,10 +69,13 @@ UploadFileToAgent_JobTitle=Initiate file upload to agent
 UploadFileToServer_JobError=Cannot upload file to server
 UploadFileToServer_JobTitle=Upload file to server
 UploadFileToServer_TaskNamePrefix=Upload file 
+ViewAgentFilesProvider_JobError=Cannot read remote directory
+ViewAgentFilesProvider_JobTitle=Reading remote directory
+ViewAgentFilesProvider_Loading=Loading...
 ViewServerFile_DeletAck=Are you sure you want to delete this file?
+ViewServerFile_DeletFileFromServerJob=Delete file from server
 ViewServerFile_DeleteConfirmation=Delete confirmation
 ViewServerFile_DeleteFileOnServerAction=Delete file on server
-ViewServerFile_DeletFileFromServerJob=Delete file from server
 ViewServerFile_ErrorDeleteFileJob=Error while deleting file.
 ViewServerFile_FileName=File name
 ViewServerFile_FileSize=File size
index 1e7aff0..71d278e 100644 (file)
@@ -1,9 +1,47 @@
+AgentFileManager_AllFiles=All Files
+AgentFileManager_ColDate=Date modified
+AgentFileManager_ColName=Name
+AgentFileManager_ColSize=Size
+AgentFileManager_ColType=Type
+AgentFileManager_CreateFolder=&Create folder
+AgentFileManager_CreatingFolder=Creating folder
+AgentFileManager_Delete=&Delete
+AgentFileManager_DirectoryReadError=Cannot read remote directory
+AgentFileManager_Download=&Download...
+AgentFileManager_DownloadFileFromAgent=Download file from agent
+AgentFileManager_DownloadJobError=Error downloading file %s from node %d
+AgentFileManager_DownloadJobTitle=Download file from agent and start tail
+AgentFileManager_Error=Error
+AgentFileManager_FileDownloadError=Error while downloading file %s from node %s [%d]
+AgentFileManager_FolderCreationError=Cannot create folder
+AgentFileManager_MoveError=Cannot move file
+AgentFileManager_MoveFile=Moving file
+AgentFileManager_OpenViewError=Error opening view: %s
+AgentFileManager_PartTitle=File Manager - %s
+AgentFileManager_RefreshFolder=Refresh this folder
+AgentFileManager_Rename=&Rename
+AgentFileManager_RenameError=Cannot rename file
+AgentFileManager_Show=&Show
+AgentFileManager_StartDownloadDialogTitle=Start Download
+AgentFileManager_UploadFile=&Upload file...
+AgentFileManager_UploadFileJobTitle=Upload file to agent
+AgentFileManager_UploadFolder=&Upload folder...
+AgentFileManager_UploadFolderJobTitle=Upload folder to agent
+CreateFolderDialog_Label=New folder name
+CreateFolderDialog_Title=Create Folder
 GetServerFileList_ErrorMessageFileView=Error opening server file list:
 GetServerFileList_ErrorMessageFileViewTitle=Error opening server file view
 LocalFileSelector_AllFiles=Todos los ficheros
 LocalFileSelector_None=<ninguno>
 LocalFileSelector_SelectFile=Seleccionar Fichero
 LocalFileSelector_Tooltip=Seleccionar un fichero
+OpenFileManager_Error=Error
+OpenFileManager_ErrorText=Cannot open file manager: %s
+RenameFileDialog_NewName=New file name
+RenameFileDialog_OldName=Old file name
+RenameFileDialog_Title=Rename
+RenameFileDialog_Warning=Warning
+RenameFileDialog_WarningMessage=File name should not contain '/' and '\\' symbols
 SelectServerFileDialog_ColModTime=Modificado
 SelectServerFileDialog_ColName=Nombre
 SelectServerFileDialog_ColSize=Tama\u00f1o
@@ -14,6 +52,7 @@ SelectServerFileDialog_Warning=Advertencia
 SelectServerFileDialog_WarningText=Seleccionar un fichero de la lista
 ServerFileSelector_None=<ninguno>
 ServerFileSelector_Tooltip=Seleccionar un fichero
+StartClientToAgentFolderUploadDialog_Title=Start Folder Upload
 StartClientToServerFileUploadDialog_LocalFile=Fichero local
 StartClientToServerFileUploadDialog_RemoteFileName=Nombre del fichero remoto
 StartClientToServerFileUploadDialog_Title=Subir fichero
@@ -30,6 +69,9 @@ UploadFileToAgent_JobTitle=Iniciar el env\u00edo del fichero al agente
 UploadFileToServer_JobError=No es posible subir el fichero al servidor
 UploadFileToServer_JobTitle=Subir fichero al servidor
 UploadFileToServer_TaskNamePrefix=Subir fichero
+ViewAgentFilesProvider_JobError=Cannot read remote directory
+ViewAgentFilesProvider_JobTitle=Reading remote directory
+ViewAgentFilesProvider_Loading=Loading...
 ViewServerFile_DeletAck=Are you sure you want to delete this file?
 ViewServerFile_DeletFileFromServerJob=Delete file from server
 ViewServerFile_DeleteConfirmation=Delete confirmation
index 377e209..5c06702 100644 (file)
@@ -1,9 +1,47 @@
+AgentFileManager_AllFiles=All Files
+AgentFileManager_ColDate=Date modified
+AgentFileManager_ColName=Name
+AgentFileManager_ColSize=Size
+AgentFileManager_ColType=Type
+AgentFileManager_CreateFolder=&Create folder
+AgentFileManager_CreatingFolder=Creating folder
+AgentFileManager_Delete=&Delete
+AgentFileManager_DirectoryReadError=Cannot read remote directory
+AgentFileManager_Download=&Download...
+AgentFileManager_DownloadFileFromAgent=Download file from agent
+AgentFileManager_DownloadJobError=Error downloading file %s from node %d
+AgentFileManager_DownloadJobTitle=Download file from agent and start tail
+AgentFileManager_Error=Error
+AgentFileManager_FileDownloadError=Error while downloading file %s from node %s [%d]
+AgentFileManager_FolderCreationError=Cannot create folder
+AgentFileManager_MoveError=Cannot move file
+AgentFileManager_MoveFile=Moving file
+AgentFileManager_OpenViewError=Error opening view: %s
+AgentFileManager_PartTitle=File Manager - %s
+AgentFileManager_RefreshFolder=Refresh this folder
+AgentFileManager_Rename=&Rename
+AgentFileManager_RenameError=Cannot rename file
+AgentFileManager_Show=&Show
+AgentFileManager_StartDownloadDialogTitle=Start Download
+AgentFileManager_UploadFile=&Upload file...
+AgentFileManager_UploadFileJobTitle=Upload file to agent
+AgentFileManager_UploadFolder=&Upload folder...
+AgentFileManager_UploadFolderJobTitle=Upload folder to agent
+CreateFolderDialog_Label=New folder name
+CreateFolderDialog_Title=Create Folder
 GetServerFileList_ErrorMessageFileView=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0442\u043a\u0440\u044b\u0442\u0438\u044f \u0441\u043f\u0438\u0441\u043a\u0430 \u0444\u0430\u0439\u043b\u043e\u0432 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435:
 GetServerFileList_ErrorMessageFileViewTitle=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0442\u043a\u0440\u044b\u0442\u0438\u044f \u0441\u043f\u0438\u0441\u043a\u0430 \u0444\u0430\u0439\u043b\u043e\u0432 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435
 LocalFileSelector_AllFiles=\u0412\u0441\u0435 \u0444\u0430\u0439\u043b\u044b
 LocalFileSelector_None=<\u043d\u0435\u0442>
 LocalFileSelector_SelectFile=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0444\u0430\u0439\u043b
 LocalFileSelector_Tooltip=\u0412\u044b\u0431\u043e\u0440 \u0444\u0430\u0439\u043b\u0430
+OpenFileManager_Error=Error
+OpenFileManager_ErrorText=Cannot open file manager: %s
+RenameFileDialog_NewName=New file name
+RenameFileDialog_OldName=Old file name
+RenameFileDialog_Title=Rename
+RenameFileDialog_Warning=Warning
+RenameFileDialog_WarningMessage=File name should not contain '/' and '\\' symbols
 SelectServerFileDialog_ColModTime=\u0418\u0437\u043c\u0435\u043d\u0435\u043d
 SelectServerFileDialog_ColName=\u0418\u043c\u044f
 SelectServerFileDialog_ColSize=\u0420\u0430\u0437\u043c\u0435\u0440
@@ -14,6 +52,7 @@ SelectServerFileDialog_Warning=\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\
 SelectServerFileDialog_WarningText=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b \u0438\u0437 \u0441\u043f\u0438\u0441\u043a\u0430
 ServerFileSelector_None=<\u043d\u0435\u0442>
 ServerFileSelector_Tooltip=\u0412\u044b\u0431\u043e\u0440 \u0444\u0430\u0439\u043b\u0430
+StartClientToAgentFolderUploadDialog_Title=Start Folder Upload
 StartClientToServerFileUploadDialog_LocalFile=\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0444\u0430\u0439\u043b
 StartClientToServerFileUploadDialog_RemoteFileName=\u0418\u043c\u044f \u0444\u0430\u0439\u043b\u0430 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435
 StartClientToServerFileUploadDialog_Title=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0444\u0430\u0439\u043b\u0430
@@ -30,6 +69,9 @@ UploadFileToAgent_JobTitle=\u0418\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u043
 UploadFileToServer_JobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0444\u0430\u0439\u043b \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440
 UploadFileToServer_JobTitle=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0444\u0430\u0439\u043b\u0430 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440
 UploadFileToServer_TaskNamePrefix=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0444\u0430\u0439\u043b\u0430
+ViewAgentFilesProvider_JobError=Cannot read remote directory
+ViewAgentFilesProvider_JobTitle=Reading remote directory
+ViewAgentFilesProvider_Loading=Loading...
 ViewServerFile_DeletAck=\u0412\u044b\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0444\u0430\u0439\u043b?
 ViewServerFile_DeletFileFromServerJob=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u0430 \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430
 ViewServerFile_DeleteConfirmation=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f
index 8448974..5c94dce 100644 (file)
@@ -1,9 +1,47 @@
+AgentFileManager_AllFiles=All Files
+AgentFileManager_ColDate=Date modified
+AgentFileManager_ColName=Name
+AgentFileManager_ColSize=Size
+AgentFileManager_ColType=Type
+AgentFileManager_CreateFolder=&Create folder
+AgentFileManager_CreatingFolder=Creating folder
+AgentFileManager_Delete=&Delete
+AgentFileManager_DirectoryReadError=Cannot read remote directory
+AgentFileManager_Download=&Download...
+AgentFileManager_DownloadFileFromAgent=Download file from agent
+AgentFileManager_DownloadJobError=Error downloading file %s from node %d
+AgentFileManager_DownloadJobTitle=Download file from agent and start tail
+AgentFileManager_Error=Error
+AgentFileManager_FileDownloadError=Error while downloading file %s from node %s [%d]
+AgentFileManager_FolderCreationError=Cannot create folder
+AgentFileManager_MoveError=Cannot move file
+AgentFileManager_MoveFile=Moving file
+AgentFileManager_OpenViewError=Error opening view: %s
+AgentFileManager_PartTitle=File Manager - %s
+AgentFileManager_RefreshFolder=Refresh this folder
+AgentFileManager_Rename=&Rename
+AgentFileManager_RenameError=Cannot rename file
+AgentFileManager_Show=&Show
+AgentFileManager_StartDownloadDialogTitle=Start Download
+AgentFileManager_UploadFile=&Upload file...
+AgentFileManager_UploadFileJobTitle=Upload file to agent
+AgentFileManager_UploadFolder=&Upload folder...
+AgentFileManager_UploadFolderJobTitle=Upload folder to agent
+CreateFolderDialog_Label=New folder name
+CreateFolderDialog_Title=Create Folder
 GetServerFileList_ErrorMessageFileView=Error opening server file list:
 GetServerFileList_ErrorMessageFileViewTitle=Error opening server file view
 LocalFileSelector_AllFiles=All files
 LocalFileSelector_None=<none>
 LocalFileSelector_SelectFile=Select File
 LocalFileSelector_Tooltip=Select file
+OpenFileManager_Error=Error
+OpenFileManager_ErrorText=Cannot open file manager: %s
+RenameFileDialog_NewName=New file name
+RenameFileDialog_OldName=Old file name
+RenameFileDialog_Title=Rename
+RenameFileDialog_Warning=Warning
+RenameFileDialog_WarningMessage=File name should not contain '/' and '\\' symbols
 SelectServerFileDialog_ColModTime=Modified
 SelectServerFileDialog_ColName=Name
 SelectServerFileDialog_ColSize=Size
@@ -14,6 +52,7 @@ SelectServerFileDialog_Warning=Warning
 SelectServerFileDialog_WarningText=Please select file from the list
 ServerFileSelector_None=<none>
 ServerFileSelector_Tooltip=Select file
+StartClientToAgentFolderUploadDialog_Title=Start Folder Upload
 StartClientToServerFileUploadDialog_LocalFile=Local file
 StartClientToServerFileUploadDialog_RemoteFileName=Remote file name
 StartClientToServerFileUploadDialog_Title=Upload File
@@ -30,6 +69,9 @@ UploadFileToAgent_JobTitle=Initiate file upload to agent
 UploadFileToServer_JobError=Cannot upload file to server
 UploadFileToServer_JobTitle=Upload file to server
 UploadFileToServer_TaskNamePrefix=Upload file
+ViewAgentFilesProvider_JobError=Cannot read remote directory
+ViewAgentFilesProvider_JobTitle=Reading remote directory
+ViewAgentFilesProvider_Loading=Loading...
 ViewServerFile_DeletAck=Are you sure you want to delete this file?
 ViewServerFile_DeletFileFromServerJob=Delete file from server
 ViewServerFile_DeleteConfirmation=Delete confirmation
index 86100c6..abf4d4a 100644 (file)
@@ -146,7 +146,7 @@ public class AgentFileManager extends ViewPart
 
       session = (NXCSession)ConsoleSharedData.getSession();
       objectId = Long.parseLong(site.getSecondaryId());
-      setPartName(String.format("File Manager - %s", session.getObjectName(objectId)));
+      setPartName(String.format(Messages.get().AgentFileManager_PartTitle, session.getObjectName(objectId)));
       workspaceDir = Platform.getInstanceLocation().getURL().getPath();
    }
 
@@ -178,7 +178,7 @@ public class AgentFileManager extends ViewPart
          }
       });
 
-      final String[] columnNames = { "Name", "Type", "Size", "Date modified" };
+      final String[] columnNames = { Messages.get().AgentFileManager_ColName, Messages.get().AgentFileManager_ColType, Messages.get().AgentFileManager_ColSize, Messages.get().AgentFileManager_ColDate };
       final int[] columnWidths = { 300, 120, 150, 150 };
       viewer = new SortableTreeViewer(content, columnNames, columnWidths, 0, SWT.UP, SortableTableViewer.DEFAULT_STYLE);
       WidgetHelper.restoreTreeViewerSettings(viewer, Activator.getDefault().getDialogSettings(), TABLE_CONFIG_PREFIX);
@@ -319,7 +319,7 @@ public class AgentFileManager extends ViewPart
    private void createActions()
    {
       final IHandlerService handlerService = (IHandlerService)getSite().getService(IHandlerService.class);
-      actionRefreshDirectory = new Action("Refresh this folder", SharedIcons.REFRESH) {
+      actionRefreshDirectory = new Action(Messages.get().AgentFileManager_RefreshFolder, SharedIcons.REFRESH) {
          @Override
          public void run()
          {
@@ -335,7 +335,7 @@ public class AgentFileManager extends ViewPart
          }
       };
 
-      actionUploadFile = new Action("&Upload file...") {
+      actionUploadFile = new Action(Messages.get().AgentFileManager_UploadFile) {
          @Override
          public void run()
          {
@@ -343,15 +343,7 @@ public class AgentFileManager extends ViewPart
          }
       };
       
-     /* actionUploadFolder = new Action("&Upload folder...") {
-         @Override
-         public void run()
-         {
-            uploadFolder();
-         }
-      }; */
-
-      actionDelete = new Action("&Delete", SharedIcons.DELETE_OBJECT) {
+      actionDelete = new Action(Messages.get().AgentFileManager_Delete, SharedIcons.DELETE_OBJECT) {
          @Override
          public void run()
          {
@@ -359,7 +351,7 @@ public class AgentFileManager extends ViewPart
          }
       };
 
-      actionRename = new Action("&Rename") {
+      actionRename = new Action(Messages.get().AgentFileManager_Rename) {
          @Override
          public void run()
          {
@@ -380,7 +372,7 @@ public class AgentFileManager extends ViewPart
       final ActionHandler showFilterHandler = new ActionHandler(actionShowFilter);
       handlerService.activateHandler(actionShowFilter.getActionDefinitionId(), showFilterHandler);
 
-      actionDownloadFile = new Action("&Download...") {
+      actionDownloadFile = new Action(Messages.get().AgentFileManager_Download) {
          @Override
          public void run()
          {
@@ -388,7 +380,7 @@ public class AgentFileManager extends ViewPart
          }
       };
 
-      actionTailFile = new Action("&Show") {
+      actionTailFile = new Action(Messages.get().AgentFileManager_Show) {
          @Override
          public void run()
          {
@@ -396,7 +388,7 @@ public class AgentFileManager extends ViewPart
          }
       };
       
-      actionCreateDirectory = new Action("&Create folder") {
+      actionCreateDirectory = new Action(Messages.get().AgentFileManager_CreateFolder) {
          @Override
          public void run()
          {
@@ -476,7 +468,6 @@ public class AgentFileManager extends ViewPart
          if (((ServerFile)selection.getFirstElement()).isDirectory())
          {
             mgr.add(actionUploadFile);
-            //mgr.add(actionUploadFolder);
          }
          else
          {
@@ -513,7 +504,7 @@ public class AgentFileManager extends ViewPart
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
-            files = session.listAgentFiles(null, "/", objectId);
+            files = session.listAgentFiles(null, "/", objectId); //$NON-NLS-1$
             runInUIThread(new Runnable() {
                @Override
                public void run()
@@ -589,11 +580,11 @@ public class AgentFileManager extends ViewPart
       if (dlg.open() == Window.OK)
       {
          final NXCSession session = (NXCSession)ConsoleSharedData.getSession();
-         new ConsoleJob("Upload file to agent", null, Activator.PLUGIN_ID, null) {
+         new ConsoleJob(Messages.get().AgentFileManager_UploadFileJobTitle, null, Activator.PLUGIN_ID, null) {
             @Override
             protected void runInternal(final IProgressMonitor monitor) throws Exception
             {
-               session.uploadLocalFileToAgent(dlg.getLocalFile(), upladFolder.getFullName()+"/"+dlg.getRemoteFileName(), objectId, new ProgressListener() {
+               session.uploadLocalFileToAgent(dlg.getLocalFile(), upladFolder.getFullName()+"/"+dlg.getRemoteFileName(), objectId, new ProgressListener() { //$NON-NLS-1$
                   private long prevWorkDone = 0;
 
                   @Override
@@ -651,13 +642,13 @@ public class AgentFileManager extends ViewPart
       if (dlg.open() == Window.OK)
       {
          final NXCSession session = (NXCSession)ConsoleSharedData.getSession();
-         new ConsoleJob("Upload file to agent", null, Activator.PLUGIN_ID, null) {
+         new ConsoleJob(Messages.get().AgentFileManager_UploadFolderJobTitle, null, Activator.PLUGIN_ID, null) {
             @Override
             protected void runInternal(final IProgressMonitor monitor) throws Exception
             {
                File folder = dlg.getLocalFile();
-               session.createFolderOnAgent(upladFolder.getFullName()+"/"+dlg.getRemoteFileName(), objectId);
-               listFilesForFolder(folder, upladFolder.getFullName()+"/"+dlg.getRemoteFileName(), monitor);
+               session.createFolderOnAgent(upladFolder.getFullName()+"/"+dlg.getRemoteFileName(), objectId); //$NON-NLS-1$
+               listFilesForFolder(folder, upladFolder.getFullName()+"/"+dlg.getRemoteFileName(), monitor); //$NON-NLS-1$
                
                upladFolder.setChildren(session.listAgentFiles(upladFolder, upladFolder.getFullName(), objectId));
                runInUIThread(new Runnable() {
@@ -694,12 +685,12 @@ public class AgentFileManager extends ViewPart
       {
           if (fileEntry.isDirectory()) 
           {
-             session.createFolderOnAgent(upladFolder+"/"+fileEntry.getName(), objectId);
-             listFilesForFolder(fileEntry, upladFolder+"/"+fileEntry.getName(), monitor);
+             session.createFolderOnAgent(upladFolder+"/"+fileEntry.getName(), objectId); //$NON-NLS-1$
+             listFilesForFolder(fileEntry, upladFolder+"/"+fileEntry.getName(), monitor); //$NON-NLS-1$
           } 
           else 
           {
-             session.uploadLocalFileToAgent(fileEntry, upladFolder+"/"+fileEntry.getName(), objectId, new ProgressListener() {
+             session.uploadLocalFileToAgent(fileEntry, upladFolder+"/"+fileEntry.getName(), objectId, new ProgressListener() { //$NON-NLS-1$
                 private long prevWorkDone = 0;
 
                 @Override
@@ -779,11 +770,11 @@ public class AgentFileManager extends ViewPart
 
       final ServerFile sf = ((ServerFile)objects[0]);
 
-      ConsoleJob job = new ConsoleJob("Download file from agent and start tail", null, Activator.PLUGIN_ID, null) {
+      ConsoleJob job = new ConsoleJob(Messages.get().AgentFileManager_DownloadJobTitle, null, Activator.PLUGIN_ID, null) {
          @Override
          protected String getErrorMessage()
          {
-            return String.format("Error while downloading %s file from %d node.", sf.getFullName(), objectId);
+            return String.format(Messages.get().AgentFileManager_DownloadJobError, sf.getFullName(), objectId);
          }
 
          @Override
@@ -804,8 +795,8 @@ public class AgentFileManager extends ViewPart
                   }
                   catch(Exception e)
                   {
-                     MessageDialogHelper.openError(window.getShell(), "Error opening view.",
-                           String.format("Error opening view: %s", e.getLocalizedMessage()));
+                     MessageDialogHelper.openError(window.getShell(), Messages.get().AgentFileManager_Error,
+                           String.format(Messages.get().AgentFileManager_OpenViewError, e.getLocalizedMessage()));
                   }
                }
             });
@@ -873,7 +864,7 @@ public class AgentFileManager extends ViewPart
             @Override
             protected String getErrorMessage()
             {
-               return "Error while retrieving children of server file";
+               return Messages.get().AgentFileManager_DirectoryReadError;
             }
          };
          job.setUser(false);
@@ -907,7 +898,7 @@ public class AgentFileManager extends ViewPart
     * @throws IOException 
     * @throws NXCException 
     */
-   private void downloadDir(final ServerFile sf, String localFileName,ZipOutputStream zos) throws NXCException, IOException
+   private void downloadDir(final ServerFile sf, String localFileName, ZipOutputStream zos) throws NXCException, IOException
    {
           //create directory inside of zip
       zos.putNextEntry(new ZipEntry(localFileName+File.separator));
@@ -921,11 +912,11 @@ public class AgentFileManager extends ViewPart
       {
          if(files[i].isDirectory())
          {
-            downloadDir(files[i], localFileName+"/"+sf.getName(),zos);
+            downloadDir(files[i], localFileName + "/" + sf.getName(), zos); //$NON-NLS-1$
          }
          else
          {
-            final AgentFile file = session.downloadFileFromAgent(objectId,  files[i].getFullName(), 0, false);
+            final AgentFile file = session.downloadFileFromAgent(objectId, files[i].getFullName(), 0, false);
             
                FileInputStream fis = new FileInputStream(file.getFile());
                ZipEntry zipEntry = new ZipEntry(localFileName+"/"+files[i].getName());
@@ -949,7 +940,7 @@ public class AgentFileManager extends ViewPart
     */
    private void downloadFile(final String remoteName)
    {
-      ConsoleJob job = new ConsoleJob("Download file from agent", null, Activator.PLUGIN_ID, null) {
+      ConsoleJob job = new ConsoleJob(Messages.get().AgentFileManager_DownloadFileFromAgent, null, Activator.PLUGIN_ID, null) {
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
@@ -983,7 +974,7 @@ public class AgentFileManager extends ViewPart
          @Override
          protected String getErrorMessage()
          {
-            return String.format("Error while downloading file %s from node %s [%d]", remoteName, session.getObjectName(objectId), objectId);
+            return String.format(Messages.get().AgentFileManager_FileDownloadError, remoteName, session.getObjectName(objectId), objectId);
          }
       };
       job.start();
@@ -1010,14 +1001,14 @@ public class AgentFileManager extends ViewPart
          @Override
          protected String getErrorMessage()
          {
-            return "Error while rename file job";
+            return Messages.get().AgentFileManager_RenameError;
          }
 
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
             final ServerFile sf = (ServerFile)objects[0];
-            session.renameAgentFile(objectId, sf.getFullName(), sf.getParent().getFullName() + "/" + newName);
+            session.renameAgentFile(objectId, sf.getFullName(), sf.getParent().getFullName() + "/" + newName); //$NON-NLS-1$
 
             runInUIThread(new Runnable() {
                @Override
@@ -1036,17 +1027,17 @@ public class AgentFileManager extends ViewPart
     */
    private void moveFile(final ServerFile target, final ServerFile object)
    {
-      new ConsoleJob(Messages.get().ViewServerFile_DeletFileFromServerJob, this, Activator.PLUGIN_ID, Activator.PLUGIN_ID) {
+      new ConsoleJob(Messages.get().AgentFileManager_MoveFile, this, Activator.PLUGIN_ID, Activator.PLUGIN_ID) {
          @Override
          protected String getErrorMessage()
          {
-            return "Error while move file job";
+            return Messages.get().AgentFileManager_MoveError;
          }
 
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
-            session.renameAgentFile(objectId, object.getFullName(), target.getFullName() + "/" + object.getName());
+            session.renameAgentFile(objectId, object.getFullName(), target.getFullName() + "/" + object.getName()); //$NON-NLS-1$
 
             runInUIThread(new Runnable() {
                @Override
@@ -1082,17 +1073,17 @@ public class AgentFileManager extends ViewPart
       
       final String newFolder = dlg.getNewName();
       
-      new ConsoleJob("Create folder job", this, Activator.PLUGIN_ID, Activator.PLUGIN_ID) {
+      new ConsoleJob(Messages.get().AgentFileManager_CreatingFolder, this, Activator.PLUGIN_ID, Activator.PLUGIN_ID) {
          @Override
          protected String getErrorMessage()
          {
-            return "Error while create folder job";
+            return Messages.get().AgentFileManager_FolderCreationError;
          }
 
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
-            session.createFolderOnAgent(parentFolder.getFullName()+"/"+newFolder, objectId);
+            session.createFolderOnAgent(parentFolder.getFullName() + "/" + newFolder, objectId); //$NON-NLS-1$
             parentFolder.setChildren(session.listAgentFiles(parentFolder, parentFolder.getFullName(), objectId));
 
             runInUIThread(new Runnable() {
index 76048fd..e6b0f3a 100644 (file)
@@ -67,9 +67,9 @@ public class ServerFileLabelProvider extends LabelProvider implements ITableLabe
                        case ViewServerFile.COLUMN_TYPE:
                                return ((ServerFile)element).getExtension();
                        case ViewServerFile.COLUMN_SIZE:
-                               return (((ServerFile)element).isDirectory() || ((ServerFile)element).isPlaceholder()) ? "" : Long.toString(((ServerFile)element).getSize());
+                               return (((ServerFile)element).isDirectory() || ((ServerFile)element).isPlaceholder()) ? "" : Long.toString(((ServerFile)element).getSize()); //$NON-NLS-1$
                        case ViewServerFile.COLUMN_MODIFYED:
-                               return (((ServerFile)element).isPlaceholder() || ((ServerFile)element).getModifyicationTime().getTime() == 0) ? "" : RegionalSettings.getDateTimeFormat().format(((ServerFile)element).getModifyicationTime());
+                               return (((ServerFile)element).isPlaceholder() || ((ServerFile)element).getModifyicationTime().getTime() == 0) ? "" : RegionalSettings.getDateTimeFormat().format(((ServerFile)element).getModifyicationTime()); //$NON-NLS-1$
                }
                return null;
        }
index 12cb56e..043f3b8 100644 (file)
@@ -56,7 +56,7 @@ public class ViewAgentFilesProvider implements ITreeContentProvider
        {
           if(((ServerFile)parentElement).getChildren() == null)
           {
-         ConsoleJob job = new ConsoleJob(Messages.get().SelectServerFileDialog_JobTitle, null, Activator.PLUGIN_ID, null) {
+         ConsoleJob job = new ConsoleJob(Messages.get().ViewAgentFilesProvider_JobTitle, null, Activator.PLUGIN_ID, null) {
             @Override
             protected void runInternal(IProgressMonitor monitor) throws Exception
             {
@@ -74,12 +74,12 @@ public class ViewAgentFilesProvider implements ITreeContentProvider
             @Override
             protected String getErrorMessage()
             {
-               return "Error while retrieving children of server file";
+               return Messages.get().ViewAgentFilesProvider_JobError;
             }
          };
          job.setUser(false);
          job.start();
-         return new ServerFile[] { new ServerFile("Loading...", ServerFile.PLACEHOLDER, (ServerFile)parentElement, ((ServerFile)parentElement).getNodeId()) };
+         return new ServerFile[] { new ServerFile(Messages.get().ViewAgentFilesProvider_Loading, ServerFile.PLACEHOLDER, (ServerFile)parentElement, ((ServerFile)parentElement).getNodeId()) };
           }
                return ((ServerFile)parentElement).getChildren();
        }
@@ -122,7 +122,4 @@ public class ViewAgentFilesProvider implements ITreeContentProvider
             list.add(e);      
       return list.toArray();
    }
-   
-   
-
 }