Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Hirsl2005-06-14 15:44:44 +0000
committerVladimir Hirsl2005-06-14 15:44:44 +0000
commitf33fc3358d8c398b551b71e5a0de16f44630e63e (patch)
treefe632f923375ce1cc2d6e6bee81d17aba03ee004 /build/org.eclipse.cdt.make.ui
parent2e043c84e6b50354cd30b5b29406da3d25e003ce (diff)
downloadorg.eclipse.cdt-f33fc3358d8c398b551b71e5a0de16f44630e63e.tar.gz
org.eclipse.cdt-f33fc3358d8c398b551b71e5a0de16f44630e63e.tar.xz
org.eclipse.cdt-f33fc3358d8c398b551b71e5a0de16f44630e63e.zip
Externalized string in DiscoveredPathContainerPage.
Fix for 99275: ScannerInfo UI extension point issue.
Diffstat (limited to 'build/org.eclipse.cdt.make.ui')
-rw-r--r--build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties1
-rw-r--r--build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/AbstractDiscoveryOptionsBlock.java12
-rw-r--r--build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java4
3 files changed, 9 insertions, 8 deletions
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties
index 2f30f1f26b1..00dd76fff37 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties
@@ -270,6 +270,7 @@ ScannerConfigOptionsDialog.error.message=An error occurred while setting the pro
DiscoveredScannerConfigurationContainerPage.title=Edit container
DiscoveredScannerConfigurationContainerPage.description=Manage discovered scanner configuration
DiscoveredScannerConfigurationContainerPage.list.title=Discovered include paths and symbol definitions
+DiscoveredScannerConfigurationContainerPage.initialization.error.message=Error initializing Discovered paths container
CopyDiscoveredPathAction.title=Copy
CopyDiscoveredPathAction.description=Copy as text
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/AbstractDiscoveryOptionsBlock.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/AbstractDiscoveryOptionsBlock.java
index 1c04c481f3b..1e65671725e 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/AbstractDiscoveryOptionsBlock.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/AbstractDiscoveryOptionsBlock.java
@@ -68,31 +68,31 @@ public abstract class AbstractDiscoveryOptionsBlock extends AbstractCOptionPage
/**
* @return Returns the project.
*/
- protected IProject getProject() {
+ public IProject getProject() {
return getContainer().getProject();
}
/**
* @return Returns the fPrefs.
*/
- protected Preferences getPrefs() {
+ public Preferences getPrefs() {
return fPrefs;
}
/**
* @return Returns the fBuildInfo.
*/
- protected IScannerConfigBuilderInfo2 getBuildInfo() {
+ public IScannerConfigBuilderInfo2 getBuildInfo() {
return fBuildInfo;
}
/**
* @return Returns the fInitialized.
*/
- protected boolean isInitialized() {
+ public boolean isInitialized() {
return fInitialized;
}
/**
* @param initialized The fInitialized to set.
*/
- protected void setInitialized(boolean initialized) {
+ public void setInitialized(boolean initialized) {
fInitialized = initialized;
}
@@ -214,7 +214,7 @@ public abstract class AbstractDiscoveryOptionsBlock extends AbstractCOptionPage
}
}
- protected void updateContainer() {
+ public void updateContainer() {
getContainer().updateContainer();
}
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java
index bc901b21203..0cff6a3bc36 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java
@@ -92,6 +92,7 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
private static final String CONTAINER_LABEL = PREFIX + ".title"; //$NON-NLS-1$
private static final String CONTAINER_DESCRIPTION = PREFIX + ".description"; //$NON-NLS-1$
private static final String CONTAINER_LIST_LABEL = PREFIX + ".list.title"; //$NON-NLS-1$
+ private static final String CONTAINER_INITIALIZATION_ERROR = PREFIX +".initialization.error.message"; //$NON-NLS-1$
private final int IDX_UP = 0;
private final int IDX_DOWN = 1;
@@ -161,7 +162,7 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
try {
info = MakeCorePlugin.getDefault().getDiscoveryManager().getDiscoveredInfo(fCProject.getProject());
} catch (CoreException e) {
- setErrorMessage("Error initializing Discovered paths container");
+ setErrorMessage(MakeUIPlugin.getResourceString(CONTAINER_INITIALIZATION_ERROR));
}
}
@@ -531,7 +532,6 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
* @param index
*/
private void containerPageCustomButtonPressed(TreeListDialogField field, int index) {
- DiscoveredElement[] containers = null;
switch (index) {
case IDX_UP:
/* move entry up */

Back to the top