[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] Scanner config discovery - fixes (PR 64368 & 65121)
|
This patch contains fixes for 2 problems:
PR 64368: [Scanner Config] Explain diff between Delete and Remove in
Discovered Path Container - Remove changed to Disable, Restore changed to
Enable, annotation (removed) changed to (disabled).
PR 65121: [Scanner Config] Importing 1.2.1 project does not update
properties - Discovered Paths container is now automatically created when
SC discovery is enabled for the first time for the legacy project
Thanks,
Vmir
Index: src/org/eclipse/cdt/make/internal/ui/MakeResources.properties
===================================================================
RCS file: /home/tools/org.eclipse.cdt-build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties,v
retrieving revision 1.23
diff -u -r1.23 MakeResources.properties
--- src/org/eclipse/cdt/make/internal/ui/MakeResources.properties 8 Jun 2004 19:05:08 -0000 1.23
+++ src/org/eclipse/cdt/make/internal/ui/MakeResources.properties 21 Jun 2004 21:15:35 -0000
@@ -211,10 +211,11 @@
ManageScannerConfigDialogCommon.discoveredGroup.removed.label=Removed:
ManageScannerConfigDialogCommon.discoveredGroup.buttons.up.label=Up
ManageScannerConfigDialogCommon.discoveredGroup.buttons.down.label=Down
-ManageScannerConfigDialogCommon.discoveredGroup.buttons.remove.label=Remove
-ManageScannerConfigDialogCommon.discoveredGroup.buttons.restore.label=Restore
+ManageScannerConfigDialogCommon.discoveredGroup.buttons.disable.label=Disable
+ManageScannerConfigDialogCommon.discoveredGroup.buttons.enable.label=Enable
ManageScannerConfigDialogCommon.discoveredGroup.buttons.delete.label=Delete
ManageScannerConfigDialogCommon.discoveredGroup.buttons.deleteAll.label=Delete all
+ManageScannerConfigDialogCommon.discoveredGroup.annotation.disabled=disabled
# --- ManageDefinedSymbolsDialog dialog ---
ManageDefinedSymbolsDialog.title=Manage defined symbols
Index: src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java,v
retrieving revision 1.1
diff -u -r1.1 DiscoveredElementLabelProvider.java
--- src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java 25 May 2004 19:04:11 -0000 1.1
+++ src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java 21 Jun 2004 21:15:35 -0000
@@ -13,6 +13,7 @@
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathEntryMessages;
import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry;
+import org.eclipse.cdt.make.internal.ui.MakeUIPlugin;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.jface.resource.CompositeImageDescriptor;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -37,6 +38,9 @@
private ImageDescriptor fRemovedIncludeIcon, fRemovedMacroIcon;
private ImageDescriptorRegistry fRegistry;
+ private final String DISABLED_LABEL = MakeUIPlugin.
+ getResourceString("ManageScannerConfigDialogCommon.discoveredGroup.annotation.disabled");//$NON-NLS-1$
+
public DiscoveredElementLabelProvider() {
fRegistry = CUIPlugin.getImageDescriptorRegistry();
fIncludeIcon = CPluginImages.DESC_OBJS_INCLUDES_FOLDER;
@@ -98,10 +102,18 @@
case DiscoveredElement.CONTAINER:
case DiscoveredElement.INCLUDE_PATH:
case DiscoveredElement.SYMBOL_DEFINITION:
- return elem.getEntry() + (elem.isRemoved() ? " (removed)" : "");
+ return elem.getEntry() + (elem.isRemoved() ? addAnnotation(DISABLED_LABEL) : ""); //$NON-NLS-1$
}
}
return super.getText(element);
+ }
+
+ /**
+ * @param annotation
+ * @return
+ */
+ private String addAnnotation(String annotation) {
+ return " (" + annotation + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
/* (non-Javadoc)
Index: src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java,v
retrieving revision 1.1
diff -u -r1.1 DiscoveredPathContainerPage.java
--- src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java 25 May 2004 19:04:11 -0000 1.1
+++ src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java 21 Jun 2004 21:15:35 -0000
@@ -60,8 +60,8 @@
private static final String DISC_COMMON_PREFIX = "ManageScannerConfigDialogCommon"; //$NON-NLS-1$
private static final String UP = DISC_COMMON_PREFIX + ".discoveredGroup.buttons.up.label"; //$NON-NLS-1$
private static final String DOWN = DISC_COMMON_PREFIX + ".discoveredGroup.buttons.down.label"; //$NON-NLS-1$
- private static final String REMOVE = DISC_COMMON_PREFIX + ".discoveredGroup.buttons.remove.label"; //$NON-NLS-1$
- private static final String RESTORE = DISC_COMMON_PREFIX + ".discoveredGroup.buttons.restore.label"; //$NON-NLS-1$
+ private static final String DISABLE = DISC_COMMON_PREFIX + ".discoveredGroup.buttons.disable.label"; //$NON-NLS-1$
+ private static final String ENABLE = DISC_COMMON_PREFIX + ".discoveredGroup.buttons.enable.label"; //$NON-NLS-1$
private static final String DELETE = DISC_COMMON_PREFIX + ".discoveredGroup.buttons.delete.label"; //$NON-NLS-1$
private static final String CONTAINER_LABEL = PREFIX + ".title"; //$NON-NLS-1$
@@ -70,16 +70,16 @@
private final int IDX_UP = 0;
private final int IDX_DOWN = 1;
- private final int IDX_REMOVE = 2;
- private final int IDX_RESTORE = 3;
+ private final int IDX_ENABLE = 2;
+ private final int IDX_DISABLE = 3;
private final int IDX_DELETE = 5;
private static final int DISC_UP = 0;
private static final int DISC_DOWN = 1;
- private static final int DO_REMOVE = 0;
- private static final int DO_RESTORE = 1;
+ private static final int DO_DISABLE = 0;
+ private static final int DO_ENABLE = 1;
private ICProject fCProject;
private IContainerEntry fPathEntry;
@@ -97,8 +97,8 @@
String[] buttonLabels = new String[]{
/* IDX_UP */ MakeUIPlugin.getResourceString(UP),
/* IDX_DOWN */ MakeUIPlugin.getResourceString(DOWN),
- /* IDX_REMOVE */MakeUIPlugin.getResourceString(REMOVE),
- /* IDX_RESTORE */MakeUIPlugin.getResourceString(RESTORE),
+ /* IDX_ENABLE */MakeUIPlugin.getResourceString(ENABLE),
+ /* IDX_DISABLE */MakeUIPlugin.getResourceString(DISABLE),
null,
/* IDX_DELETE */MakeUIPlugin.getResourceString(DELETE),
};
@@ -386,13 +386,13 @@
/* move entry down */
dirty |= moveDown();
break;
- case IDX_REMOVE:
+ case IDX_DISABLE:
/* remove */
- dirty |= removeRestoreEntry(DO_REMOVE);
+ dirty |= enableDisableEntry(DO_DISABLE);
break;
- case IDX_RESTORE:
+ case IDX_ENABLE:
/* restore */
- dirty |= removeRestoreEntry(DO_RESTORE);
+ dirty |= enableDisableEntry(DO_ENABLE);
break;
case IDX_DELETE:
/* delete */
@@ -466,9 +466,9 @@
*
* @param remove
*/
- private boolean removeRestoreEntry(int action) {
+ private boolean enableDisableEntry(int action) {
boolean rc = false;
- boolean remove = (action == DO_REMOVE);
+ boolean remove = (action == DO_DISABLE);
List selElements = fDiscoveredContainerList.getSelectedElements();
for (int i = selElements.size() - 1; i >= 0; --i) {
DiscoveredElement elem = (DiscoveredElement) selElements.get(i);
@@ -546,8 +546,8 @@
List selElements = fDiscoveredContainerList.getSelectedElements();
fDiscoveredContainerList.enableButton(IDX_UP, canMoveUpDown(selElements, DISC_UP));
fDiscoveredContainerList.enableButton(IDX_DOWN, canMoveUpDown(selElements, DISC_DOWN));
- fDiscoveredContainerList.enableButton(IDX_REMOVE, canRemoveRestore(selElements));
- fDiscoveredContainerList.enableButton(IDX_RESTORE, canRemoveRestore(selElements));
+ fDiscoveredContainerList.enableButton(IDX_DISABLE, canRemoveRestore(selElements));
+ fDiscoveredContainerList.enableButton(IDX_ENABLE, canRemoveRestore(selElements));
fDiscoveredContainerList.enableButton(IDX_DELETE, canDelete(selElements));
}
/**
Index: src/org/eclipse/cdt/make/ui/dialogs/DiscoveryOptionsBlock.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveryOptionsBlock.java,v
retrieving revision 1.8
diff -u -r1.8 DiscoveryOptionsBlock.java
--- src/org/eclipse/cdt/make/ui/dialogs/DiscoveryOptionsBlock.java 7 Jun 2004 18:55:24 -0000 1.8
+++ src/org/eclipse/cdt/make/ui/dialogs/DiscoveryOptionsBlock.java 21 Jun 2004 21:15:35 -0000
@@ -159,12 +159,14 @@
if (needsSCNature) {
ScannerConfigNature.addScannerConfigNature(getContainer().getProject());
needsSCNature = false;
+ fCreatePathContainer = true;
}
buildInfo = MakeCorePlugin.createScannerConfigBuildInfo(project, ScannerConfigBuilder.BUILDER_ID);
if (fCreatePathContainer) {
createDiscoveredPathContainer(project, monitor);
// create a new discovered scanner config store
MakeCorePlugin.getDefault().getDiscoveryManager().removeDiscoveredInfo(project);
+ fCreatePathContainer = false;
}
} else {
buildInfo = MakeCorePlugin.createScannerConfigBuildInfo(fPrefs, ScannerConfigBuilder.BUILDER_ID, false);
