1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-20 22:55:51 +02:00

Fix some externalized Strings warnings and incorrect icon pathes

This commit is contained in:
Martin Oberhuber 2006-07-27 11:36:52 +00:00
parent cbbf547366
commit 7a2be0808b
15 changed files with 26 additions and 25 deletions

View file

@ -21,6 +21,7 @@ import java.util.List;
import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.rse.connectorservice.dstore.DStoreConnectorService; import org.eclipse.rse.connectorservice.dstore.DStoreConnectorService;
import org.eclipse.rse.core.subsystems.SubSystem;
import org.eclipse.rse.services.dstore.files.DStoreHostFile; import org.eclipse.rse.services.dstore.files.DStoreHostFile;
import org.eclipse.rse.services.dstore.files.DStoreVirtualHostFile; import org.eclipse.rse.services.dstore.files.DStoreVirtualHostFile;
import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.services.files.IHostFile;
@ -42,7 +43,7 @@ public class DStoreFileAdapter implements IHostFileToRemoteFileAdapter
if (_listener == null) if (_listener == null)
{ {
DStoreConnectorService connectorService = (DStoreConnectorService)ss.getConnectorService(); DStoreConnectorService connectorService = (DStoreConnectorService)ss.getConnectorService();
Shell shell = FileServiceSubSystem.getActiveWorkbenchShell(); Shell shell = SubSystem.getActiveWorkbenchShell();
_listener = new RemoteFilePropertyChangeListener(shell, connectorService, connectorService.getDataStore(), ss); _listener = new RemoteFilePropertyChangeListener(shell, connectorService, connectorService.getDataStore(), ss);
} }
} }

View file

@ -83,7 +83,7 @@ public class DStoreFileSubSystemSearchResultConfiguration extends DStoreSearchRe
_fileSubSystem.listFiles(parentRemoteFile); _fileSubSystem.listFiles(parentRemoteFile);
} }
String path = fileNode.getValue() + "/" + fileNode.getName(); String path = fileNode.getValue() + "/" + fileNode.getName(); //$NON-NLS-1$
IRemoteFile remoteFile = _fileSubSystem.getRemoteFileObject(path); IRemoteFile remoteFile = _fileSubSystem.getRemoteFileObject(path);
List contained = fileNode.getNestedData(); List contained = fileNode.getNestedData();

View file

@ -212,7 +212,7 @@ public class RemoteFilePropertyChangeListener implements IDomainListener,
if (updated != null) if (updated != null)
{ {
String classification = updated.getClassification(); String classification = updated.getClassification();
if (!classification.equals("file") && !classification.equals("directory")) if (!classification.equals("file") && !classification.equals("directory")) //$NON-NLS-1$ //$NON-NLS-2$
{ {
refreshParent = true; refreshParent = true;
toUpdate.add(updated); toUpdate.add(updated);

View file

@ -68,6 +68,6 @@ public class Activator extends AbstractUIPlugin {
* @return the image descriptor * @return the image descriptor
*/ */
public static ImageDescriptor getImageDescriptor(String path) { public static ImageDescriptor getImageDescriptor(String path) {
return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.files.ftp", path); return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.files.ftp", path); //$NON-NLS-1$
} }
} }

View file

@ -49,11 +49,11 @@ public class FTPRemoteFile extends AbstractRemoteFile
{ {
if (isFile()) if (isFile())
{ {
return "file"; return "file"; //$NON-NLS-1$
} }
else else
{ {
return "directory"; return "directory"; //$NON-NLS-1$
} }
} }

View file

@ -68,6 +68,6 @@ public class Activator extends AbstractUIPlugin {
* @return the image descriptor * @return the image descriptor
*/ */
public static ImageDescriptor getImageDescriptor(String path) { public static ImageDescriptor getImageDescriptor(String path) {
return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.dstore", path); return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.files.local", path); //$NON-NLS-1$
} }
} }

View file

@ -57,9 +57,9 @@ public class LocalFileSubSystemConfiguration extends FileServiceSubSystemConfigu
public LocalFileSubSystemConfiguration() public LocalFileSubSystemConfiguration()
{ {
super(); super();
String osName = System.getProperty("os.name").toLowerCase(); String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
_isWindows = (osName.startsWith("windows")); _isWindows = (osName.startsWith("windows")); //$NON-NLS-1$
setIsUnixStyle(!_isWindows); setIsUnixStyle(!_isWindows);
} }

View file

@ -54,7 +54,7 @@ public class LocalFile extends AbstractRemoteFile implements IRemoteFile
} }
catch (Exception e) catch (Exception e)
{ {
return ""; return ""; //$NON-NLS-1$
} }
} }

View file

@ -89,25 +89,25 @@ public class LocalVirtualFile extends LocalFile implements IVirtualRemoteFile
public void setVirtualFullPath(String string) public void setVirtualFullPath(String string)
{ {
if (string.equals("")) if (string.equals("")) //$NON-NLS-1$
{ {
_node.getChild().renameTo(_node.getChild().name); _node.getChild().renameTo(_node.getChild().name);
} }
else else
{ {
_node.getChild().renameTo(string + "/" + _node.getChild().name); _node.getChild().renameTo(string + "/" + _node.getChild().name); //$NON-NLS-1$
} }
} }
public void setVirtualName(String string) public void setVirtualName(String string)
{ {
if (_node.getChild().path.equals("")) if (_node.getChild().path.equals("")) //$NON-NLS-1$
{ {
_node.getChild().renameTo(string); _node.getChild().renameTo(string);
} }
else else
{ {
_node.getChild().renameTo(_node.getChild().path + "/" + string); _node.getChild().renameTo(_node.getChild().path + "/" + string); //$NON-NLS-1$
} }
} }

View file

@ -67,6 +67,6 @@ public class Activator extends AbstractUIPlugin {
* @return the image descriptor * @return the image descriptor
*/ */
public static ImageDescriptor getImageDescriptor(String path) { public static ImageDescriptor getImageDescriptor(String path) {
return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.processes.dstore", path); return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.processes.dstore", path); //$NON-NLS-1$
} }
} }

View file

@ -67,6 +67,6 @@ public class Activator extends AbstractUIPlugin {
* @return the image descriptor * @return the image descriptor
*/ */
public static ImageDescriptor getImageDescriptor(String path) { public static ImageDescriptor getImageDescriptor(String path) {
return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.processes.dstore", path); return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.processes.local", path); //$NON-NLS-1$
} }
} }

View file

@ -69,6 +69,6 @@ public class Activator extends AbstractUIPlugin {
* @return the image descriptor * @return the image descriptor
*/ */
public static ImageDescriptor getImageDescriptor(String path) { public static ImageDescriptor getImageDescriptor(String path) {
return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.shells.dstore", path); return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.shells.dstore", path); //$NON-NLS-1$
} }
} }

View file

@ -69,6 +69,6 @@ public class Activator extends AbstractUIPlugin {
* @return the image descriptor * @return the image descriptor
*/ */
public static ImageDescriptor getImageDescriptor(String path) { public static ImageDescriptor getImageDescriptor(String path) {
return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.shells.dstore", path); return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.shells.local", path); //$NON-NLS-1$
} }
} }

View file

@ -45,14 +45,14 @@ public class LocalShellSubSystemConfiguration extends ShellServiceSubSystemConfi
*/ */
public String getCommandSeparator() public String getCommandSeparator()
{ {
String os = System.getProperty("os.name").toLowerCase(); String os = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
if (os.startsWith("win")) if (os.startsWith("win")) //$NON-NLS-1$
{ {
return "&"; return "&"; //$NON-NLS-1$
} }
else else
{ {
return ";"; return ";"; //$NON-NLS-1$
} }
} }

View file

@ -26,7 +26,7 @@ public class LocalServiceCommandShell extends ServiceCommandShell
{ {
super(cmdSS, hostShell); super(cmdSS, hostShell);
_patterns = new Patterns(); _patterns = new Patterns();
_patterns.update("cmd"); _patterns.update("cmd"); //$NON-NLS-1$
ISubSystem[] sses = cmdSS.getHost().getSubSystems(); ISubSystem[] sses = cmdSS.getHost().getSubSystems();
for (int i = 0; i < sses.length; i++) for (int i = 0; i < sses.length; i++)
{ {
@ -75,7 +75,7 @@ public class LocalServiceCommandShell extends ServiceCommandShell
} }
RemoteOutput output = null; RemoteOutput output = null;
String type = "stdout"; String type = "stdout"; //$NON-NLS-1$
if (parsedMsg != null) if (parsedMsg != null)
{ {
type = parsedMsg.type; type = parsedMsg.type;
@ -97,7 +97,7 @@ public class LocalServiceCommandShell extends ServiceCommandShell
if (parsedMsg != null) if (parsedMsg != null)
{ {
String file = parsedMsg.file; String file = parsedMsg.file;
if (type.equals("prompt")) if (type.equals("prompt")) //$NON-NLS-1$
{ {
_workingDir = file; _workingDir = file;
output.setAbsolutePath(_workingDir); output.setAbsolutePath(_workingDir);