mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-03 15:15:25 +02:00
Specify x-internal in manifest for exported internal packages. Fix some compiler warnings.
This commit is contained in:
Martin Oberhuber
parent
d847b06501
commit
d65885e486
13 changed files with 42 additions and 36 deletions
|
|
@ -9,6 +9,5 @@ Require-Bundle: org.eclipse.ui,
|
|||
org.eclipse.core.runtime,
|
||||
org.eclipse.ui.views
|
||||
Eclipse-LazyStart: true
|
||||
Export-Package: org.eclipse.dstore.extra.internal.extra
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.4
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ Export-Package: org.eclipse.rse.core,
|
|||
org.eclipse.rse.core.model,
|
||||
org.eclipse.rse.core.references,
|
||||
org.eclipse.rse.core.subsystems,
|
||||
org.eclipse.rse.internal.references,
|
||||
org.eclipse.rse.internal.references;x-internal:=true,
|
||||
org.eclipse.rse.persistence,
|
||||
org.eclipse.rse.persistence.dom
|
||||
Bundle-Vendor: %providerName
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ Export-Package: org.eclipse.rse.dstore.universal.miners,
|
|||
org.eclipse.rse.dstore.universal.miners.environment,
|
||||
org.eclipse.rse.dstore.universal.miners.filesystem,
|
||||
org.eclipse.rse.dstore.universal.miners.processes,
|
||||
org.eclipse.rse.internal.services.dstore.shell,
|
||||
org.eclipse.rse.internal.services.dstore.shell;x-internal:=true,
|
||||
org.eclipse.rse.services.dstore,
|
||||
org.eclipse.rse.services.dstore.files,
|
||||
org.eclipse.rse.services.dstore.processes,
|
||||
|
|
|
|||
|
|
@ -47,7 +47,6 @@ public class DStoreShellThread
|
|||
* @param cwd initial working directory
|
||||
* @param invocation launch shell command
|
||||
* @param encoding
|
||||
* @param patterns patterns file for output interpretation
|
||||
* @param envVars user and system environment variables to launch shell with
|
||||
*/
|
||||
public DStoreShellThread(DataStore dataStore, String cwd, String invocation, String encoding, String[] envVars)
|
||||
|
|
|
|||
|
|
@ -1258,7 +1258,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
|
|||
DataElement setCmd = getCommandDescriptor(de, C_SET_READONLY);
|
||||
if (setCmd != null)
|
||||
{
|
||||
String flag = readOnly ? "true" : "false";
|
||||
String flag = readOnly ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$
|
||||
de.setAttribute(DE.A_SOURCE, flag);
|
||||
DataElement status = ds.command(setCmd, de, true);
|
||||
try
|
||||
|
|
|
|||
|
|
@ -361,7 +361,7 @@ public class DStoreHostFile implements IHostFile
|
|||
String str = getAttribute(_element.getSource(), ATTRIBUTE_CAN_READ);
|
||||
if (str == null)
|
||||
{
|
||||
System.out.println("HELP:"+_element.toString());
|
||||
System.out.println("HELP:"+_element.toString()); //$NON-NLS-1$
|
||||
}
|
||||
return(str.equals("true")); //$NON-NLS-1$
|
||||
}
|
||||
|
|
|
|||
|
|
@ -215,9 +215,6 @@ public class DStoreStatusMonitor implements IDomainListener
|
|||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see IDomainListener#getShell()
|
||||
*/
|
||||
public Shell getShell()
|
||||
{
|
||||
// dy: DomainNotifier (which calls this method) requires the shell not be disposed
|
||||
|
|
|
|||
|
|
@ -206,24 +206,29 @@ public class DownloadListener implements IDomainListener,IUniversalDataStoreCons
|
|||
|
||||
|
||||
/**
|
||||
* Wait for the the status DataElement to be refreshed
|
||||
*
|
||||
* @param
|
||||
* ICommunicationsDiagnosticFactory factory : for creating system specific diagnostic class instance
|
||||
* Int wait : threshold for starting diagnostic. Default is 60 seconds; a zero means to use the default.
|
||||
* -1 means to force a timeout; mainly for testing purpose.
|
||||
*
|
||||
* @return The status DataElement after it has been updated, or the user
|
||||
* has pressed cancel
|
||||
*
|
||||
* @throws InterruptedException if the thread was interrupted.
|
||||
*/
|
||||
* Wait for the the status DataElement to be refreshed
|
||||
*
|
||||
* @return The status DataElement after it has been updated, or the user
|
||||
* has pressed cancel
|
||||
*
|
||||
* @throws InterruptedException if the thread was interrupted.
|
||||
*/
|
||||
public DataElement waitForUpdate() throws InterruptedException
|
||||
{
|
||||
return waitForUpdate(0); //No diagnostic
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Wait for the the status DataElement to be refreshed
|
||||
*
|
||||
* @param wait threshold for starting diagnostic. Default is 60 seconds; a zero means to use the default.
|
||||
* -1 means to force a timeout; mainly for testing purpose.
|
||||
*
|
||||
* @return The status DataElement after it has been updated, or the user
|
||||
* has pressed cancel
|
||||
*
|
||||
* @throws InterruptedException if the thread was interrupted.
|
||||
*/
|
||||
public DataElement waitForUpdate(int wait) throws InterruptedException
|
||||
{
|
||||
Display display = _display;
|
||||
|
|
|
|||
|
|
@ -192,12 +192,7 @@ public class StatusChangeListener implements IDomainListener
|
|||
|
||||
|
||||
/**
|
||||
* Wait for the the status DataElement to be refreshed
|
||||
*
|
||||
* @param
|
||||
* ICommunicationsDiagnosticFactory factory : for creating system specific diagnostic class instance
|
||||
* Int wait : threshold for starting diagnostic. Default is 60 seconds; a zero means to use the default.
|
||||
* -1 means to force a timeout; mainly for testing purpose.
|
||||
* Wait for the the status DataElement to be refreshed.
|
||||
*
|
||||
* @return The status DataElement after it has been updated, or the user
|
||||
* has pressed cancel
|
||||
|
|
@ -210,6 +205,17 @@ public class StatusChangeListener implements IDomainListener
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* Wait for the the status DataElement to be refreshed.
|
||||
*
|
||||
* @param wait threshold for starting diagnostic. Default is 60 seconds; a zero means to use the default.
|
||||
* -1 means to force a timeout; mainly for testing purpose.
|
||||
*
|
||||
* @return The status DataElement after it has been updated, or the user
|
||||
* has pressed cancel
|
||||
*
|
||||
* @throws InterruptedException if the thread was interrupted.
|
||||
*/
|
||||
public DataElement waitForUpdate(int wait) throws InterruptedException
|
||||
{
|
||||
boolean statusDone = determineStatusDone();
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ Bundle-Localization: plugin
|
|||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.eclipse.rse.services
|
||||
Eclipse-LazyStart: true
|
||||
Export-Package: org.eclipse.rse.internal.services.local.search,
|
||||
org.eclipse.rse.internal.services.local.shells,
|
||||
Export-Package: org.eclipse.rse.internal.services.local.search;x-internal:=true,
|
||||
org.eclipse.rse.internal.services.local.shells;x-internal:=true,
|
||||
org.eclipse.rse.services.local,
|
||||
org.eclipse.rse.services.local.files,
|
||||
org.eclipse.rse.services.local.processes,
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
|
|||
org.eclipse.rse.core,
|
||||
org.eclipse.rse.ui
|
||||
Eclipse-LazyStart: true
|
||||
Export-Package: org.eclipse.rse.internal.subsystems.files.core,
|
||||
Export-Package: org.eclipse.rse.internal.subsystems.files.core;x-internal:=true,
|
||||
org.eclipse.rse.subsystems.files.core,
|
||||
org.eclipse.rse.subsystems.files.core.model,
|
||||
org.eclipse.rse.subsystems.files.core.servicesubsystem,
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.ui,
|
|||
org.eclipse.rse.ui,
|
||||
org.eclipse.rse.core
|
||||
Eclipse-LazyStart: true
|
||||
Export-Package: org.eclipse.rse.internal.subsystems.shells.servicesubsystem,
|
||||
org.eclipse.rse.internal.subsystems.shells.subsystems,
|
||||
Export-Package: org.eclipse.rse.internal.subsystems.shells.servicesubsystem;x-internal:=true,
|
||||
org.eclipse.rse.internal.subsystems.shells.subsystems;x-internal:=true,
|
||||
org.eclipse.rse.subsystems.shells.core,
|
||||
org.eclipse.rse.subsystems.shells.core.model,
|
||||
org.eclipse.rse.subsystems.shells.core.subsystems,
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@ Require-Bundle: org.eclipse.ui,
|
|||
Eclipse-LazyStart: true
|
||||
Export-Package: org.eclipse.rse.core,
|
||||
org.eclipse.rse.core.comm,
|
||||
org.eclipse.rse.core.internal.subsystems,
|
||||
org.eclipse.rse.core.internal.subsystems;x-internal:=true,
|
||||
org.eclipse.rse.core.servicesubsystem,
|
||||
org.eclipse.rse.core.subsystems,
|
||||
org.eclipse.rse.core.subsystems.util,
|
||||
org.eclipse.rse.filters,
|
||||
org.eclipse.rse.internal.filters,
|
||||
org.eclipse.rse.internal.model,
|
||||
org.eclipse.rse.internal.filters;x-internal:=true,
|
||||
org.eclipse.rse.internal.model;x-internal:=true,
|
||||
org.eclipse.rse.model,
|
||||
org.eclipse.rse.ui,
|
||||
org.eclipse.rse.ui.actions,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue