Skip to content

Commit 21adc2c

Browse files
eric-milleseric-milles
committed
prevent transient java project options from being written to prefs files
1 parent b0b6489 commit 21adc2c

File tree

8 files changed

+48
-88
lines changed

8 files changed

+48
-88
lines changed

‎jdt-patch/e410/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3476,29 +3476,24 @@ public void setOption(String optionName, String optionValue) {
34763476
*/
34773477
@Override
34783478
public void setOptions(Map<String, String> newOptions) {
3479-
34803479
IEclipsePreferences projectPreferences = getEclipsePreferences();
34813480
if (projectPreferences == null) return;
34823481
try {
3483-
if (newOptions == null){
3482+
if (newOptions == null) {
34843483
projectPreferences.clear();
34853484
} else {
3486-
Iterator<Map.Entry<String, String>> entries = newOptions.entrySet().iterator();
34873485
JavaModelManager javaModelManager = JavaModelManager.getJavaModelManager();
3488-
while (entries.hasNext()){
3489-
Map.Entry<String, String> entry = entries.next();
3486+
for (Map.Entry<String, String> entry : newOptions.entrySet()) {
34903487
String key = entry.getKey();
3491-
String value = entry.getValue();
3492-
javaModelManager.storePreference(key, value, projectPreferences, newOptions);
3488+
// GROOVY add -- these project options are not persistent
3489+
if (key.startsWith("org.eclipse.jdt.core.compiler.groovy.")) continue; //$NON-NLS-1$
3490+
javaModelManager.storePreference(key, entry.getValue(), projectPreferences, newOptions);
34933491
}
34943492

34953493
// reset to default all options not in new map
34963494
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=26255
34973495
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=49691
3498-
String[] pNames = projectPreferences.keys();
3499-
int ln = pNames.length;
3500-
for (int i=0; i<ln; i++) {
3501-
String key = pNames[i];
3496+
for (String key : projectPreferences.keys()) {
35023497
if (!newOptions.containsKey(key)) {
35033498
projectPreferences.remove(key); // old preferences => remove from preferences table
35043499
}

‎jdt-patch/e411/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3480,29 +3480,24 @@ public void setOption(String optionName, String optionValue) {
34803480
*/
34813481
@Override
34823482
public void setOptions(Map<String, String> newOptions) {
3483-
34843483
IEclipsePreferences projectPreferences = getEclipsePreferences();
34853484
if (projectPreferences == null) return;
34863485
try {
3487-
if (newOptions == null){
3486+
if (newOptions == null) {
34883487
projectPreferences.clear();
34893488
} else {
3490-
Iterator<Map.Entry<String, String>> entries = newOptions.entrySet().iterator();
34913489
JavaModelManager javaModelManager = JavaModelManager.getJavaModelManager();
3492-
while (entries.hasNext()){
3493-
Map.Entry<String, String> entry = entries.next();
3490+
for (Map.Entry<String, String> entry : newOptions.entrySet()) {
34943491
String key = entry.getKey();
3495-
String value = entry.getValue();
3496-
javaModelManager.storePreference(key, value, projectPreferences, newOptions);
3492+
// GROOVY add -- these project options are not persistent
3493+
if (key.startsWith("org.eclipse.jdt.core.compiler.groovy.")) continue; //$NON-NLS-1$
3494+
javaModelManager.storePreference(key, entry.getValue(), projectPreferences, newOptions);
34973495
}
34983496

34993497
// reset to default all options not in new map
35003498
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=26255
35013499
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=49691
3502-
String[] pNames = projectPreferences.keys();
3503-
int ln = pNames.length;
3504-
for (int i=0; i<ln; i++) {
3505-
String key = pNames[i];
3500+
for (String key : projectPreferences.keys()) {
35063501
if (!newOptions.containsKey(key)) {
35073502
projectPreferences.remove(key); // old preferences => remove from preferences table
35083503
}

‎jdt-patch/e412/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3477,29 +3477,24 @@ public void setOption(String optionName, String optionValue) {
34773477
*/
34783478
@Override
34793479
public void setOptions(Map<String, String> newOptions) {
3480-
34813480
IEclipsePreferences projectPreferences = getEclipsePreferences();
34823481
if (projectPreferences == null) return;
34833482
try {
3484-
if (newOptions == null){
3483+
if (newOptions == null) {
34853484
projectPreferences.clear();
34863485
} else {
3487-
Iterator<Map.Entry<String, String>> entries = newOptions.entrySet().iterator();
34883486
JavaModelManager javaModelManager = JavaModelManager.getJavaModelManager();
3489-
while (entries.hasNext()){
3490-
Map.Entry<String, String> entry = entries.next();
3487+
for (Map.Entry<String, String> entry : newOptions.entrySet()) {
34913488
String key = entry.getKey();
3492-
String value = entry.getValue();
3493-
javaModelManager.storePreference(key, value, projectPreferences, newOptions);
3489+
// GROOVY add -- these project options are not persistent
3490+
if (key.startsWith("org.eclipse.jdt.core.compiler.groovy.")) continue; //$NON-NLS-1$
3491+
javaModelManager.storePreference(key, entry.getValue(), projectPreferences, newOptions);
34943492
}
34953493

34963494
// reset to default all options not in new map
34973495
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=26255
34983496
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=49691
3499-
String[] pNames = projectPreferences.keys();
3500-
int ln = pNames.length;
3501-
for (int i=0; i<ln; i++) {
3502-
String key = pNames[i];
3497+
for (String key : projectPreferences.keys()) {
35033498
if (!newOptions.containsKey(key)) {
35043499
projectPreferences.remove(key); // old preferences => remove from preferences table
35053500
}

‎jdt-patch/e413/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3462,29 +3462,24 @@ public void setOption(String optionName, String optionValue) {
34623462
*/
34633463
@Override
34643464
public void setOptions(Map<String, String> newOptions) {
3465-
34663465
IEclipsePreferences projectPreferences = getEclipsePreferences();
34673466
if (projectPreferences == null) return;
34683467
try {
3469-
if (newOptions == null){
3468+
if (newOptions == null) {
34703469
projectPreferences.clear();
34713470
} else {
3472-
Iterator<Map.Entry<String, String>> entries = newOptions.entrySet().iterator();
34733471
JavaModelManager javaModelManager = JavaModelManager.getJavaModelManager();
3474-
while (entries.hasNext()){
3475-
Map.Entry<String, String> entry = entries.next();
3472+
for (Map.Entry<String, String> entry : newOptions.entrySet()) {
34763473
String key = entry.getKey();
3477-
String value = entry.getValue();
3478-
javaModelManager.storePreference(key, value, projectPreferences, newOptions);
3474+
// GROOVY add -- these project options are not persistent
3475+
if (key.startsWith("org.eclipse.jdt.core.compiler.groovy.")) continue; //$NON-NLS-1$
3476+
javaModelManager.storePreference(key, entry.getValue(), projectPreferences, newOptions);
34793477
}
34803478

34813479
// reset to default all options not in new map
34823480
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=26255
34833481
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=49691
3484-
String[] pNames = projectPreferences.keys();
3485-
int ln = pNames.length;
3486-
for (int i=0; i<ln; i++) {
3487-
String key = pNames[i];
3482+
for (String key : projectPreferences.keys()) {
34883483
if (!newOptions.containsKey(key)) {
34893484
projectPreferences.remove(key); // old preferences => remove from preferences table
34903485
}

‎jdt-patch/e414/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3481,29 +3481,24 @@ public void setOption(String optionName, String optionValue) {
34813481
*/
34823482
@Override
34833483
public void setOptions(Map<String, String> newOptions) {
3484-
34853484
IEclipsePreferences projectPreferences = getEclipsePreferences();
34863485
if (projectPreferences == null) return;
34873486
try {
3488-
if (newOptions == null){
3487+
if (newOptions == null) {
34893488
projectPreferences.clear();
34903489
} else {
3491-
Iterator<Map.Entry<String, String>> entries = newOptions.entrySet().iterator();
34923490
JavaModelManager javaModelManager = JavaModelManager.getJavaModelManager();
3493-
while (entries.hasNext()){
3494-
Map.Entry<String, String> entry = entries.next();
3491+
for (Map.Entry<String, String> entry : newOptions.entrySet()) {
34953492
String key = entry.getKey();
3496-
String value = entry.getValue();
3497-
javaModelManager.storePreference(key, value, projectPreferences, newOptions);
3493+
// GROOVY add -- these project options are not persistent
3494+
if (key.startsWith("org.eclipse.jdt.core.compiler.groovy.")) continue; //$NON-NLS-1$
3495+
javaModelManager.storePreference(key, entry.getValue(), projectPreferences, newOptions);
34983496
}
34993497

35003498
// reset to default all options not in new map
35013499
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=26255
35023500
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=49691
3503-
String[] pNames = projectPreferences.keys();
3504-
int ln = pNames.length;
3505-
for (int i=0; i<ln; i++) {
3506-
String key = pNames[i];
3501+
for (String key : projectPreferences.keys()) {
35073502
if (!newOptions.containsKey(key)) {
35083503
projectPreferences.remove(key); // old preferences => remove from preferences table
35093504
}

‎jdt-patch/e415/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3481,29 +3481,24 @@ public void setOption(String optionName, String optionValue) {
34813481
*/
34823482
@Override
34833483
public void setOptions(Map<String, String> newOptions) {
3484-
34853484
IEclipsePreferences projectPreferences = getEclipsePreferences();
34863485
if (projectPreferences == null) return;
34873486
try {
3488-
if (newOptions == null){
3487+
if (newOptions == null) {
34893488
projectPreferences.clear();
34903489
} else {
3491-
Iterator<Map.Entry<String, String>> entries = newOptions.entrySet().iterator();
34923490
JavaModelManager javaModelManager = JavaModelManager.getJavaModelManager();
3493-
while (entries.hasNext()){
3494-
Map.Entry<String, String> entry = entries.next();
3491+
for (Map.Entry<String, String> entry : newOptions.entrySet()) {
34953492
String key = entry.getKey();
3496-
String value = entry.getValue();
3497-
javaModelManager.storePreference(key, value, projectPreferences, newOptions);
3493+
// GROOVY add -- these project options are not persistent
3494+
if (key.startsWith("org.eclipse.jdt.core.compiler.groovy.")) continue; //$NON-NLS-1$
3495+
javaModelManager.storePreference(key, entry.getValue(), projectPreferences, newOptions);
34983496
}
34993497

35003498
// reset to default all options not in new map
35013499
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=26255
35023500
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=49691
3503-
String[] pNames = projectPreferences.keys();
3504-
int ln = pNames.length;
3505-
for (int i=0; i<ln; i++) {
3506-
String key = pNames[i];
3501+
for (String key : projectPreferences.keys()) {
35073502
if (!newOptions.containsKey(key)) {
35083503
projectPreferences.remove(key); // old preferences => remove from preferences table
35093504
}

‎jdt-patch/e416/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3481,29 +3481,24 @@ public void setOption(String optionName, String optionValue) {
34813481
*/
34823482
@Override
34833483
public void setOptions(Map<String, String> newOptions) {
3484-
34853484
IEclipsePreferences projectPreferences = getEclipsePreferences();
34863485
if (projectPreferences == null) return;
34873486
try {
3488-
if (newOptions == null){
3487+
if (newOptions == null) {
34893488
projectPreferences.clear();
34903489
} else {
3491-
Iterator<Map.Entry<String, String>> entries = newOptions.entrySet().iterator();
34923490
JavaModelManager javaModelManager = JavaModelManager.getJavaModelManager();
3493-
while (entries.hasNext()){
3494-
Map.Entry<String, String> entry = entries.next();
3491+
for (Map.Entry<String, String> entry : newOptions.entrySet()) {
34953492
String key = entry.getKey();
3496-
String value = entry.getValue();
3497-
javaModelManager.storePreference(key, value, projectPreferences, newOptions);
3493+
// GROOVY add -- these project options are not persistent
3494+
if (key.startsWith("org.eclipse.jdt.core.compiler.groovy.")) continue; //$NON-NLS-1$
3495+
javaModelManager.storePreference(key, entry.getValue(), projectPreferences, newOptions);
34983496
}
34993497

35003498
// reset to default all options not in new map
35013499
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=26255
35023500
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=49691
3503-
String[] pNames = projectPreferences.keys();
3504-
int ln = pNames.length;
3505-
for (int i=0; i<ln; i++) {
3506-
String key = pNames[i];
3501+
for (String key : projectPreferences.keys()) {
35073502
if (!newOptions.containsKey(key)) {
35083503
projectPreferences.remove(key); // old preferences => remove from preferences table
35093504
}

‎jdt-patch/e49/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3467,29 +3467,24 @@ public void setOption(String optionName, String optionValue) {
34673467
*/
34683468
@Override
34693469
public void setOptions(Map<String, String> newOptions) {
3470-
34713470
IEclipsePreferences projectPreferences = getEclipsePreferences();
34723471
if (projectPreferences == null) return;
34733472
try {
3474-
if (newOptions == null){
3473+
if (newOptions == null) {
34753474
projectPreferences.clear();
34763475
} else {
3477-
Iterator<Map.Entry<String, String>> entries = newOptions.entrySet().iterator();
34783476
JavaModelManager javaModelManager = JavaModelManager.getJavaModelManager();
3479-
while (entries.hasNext()){
3480-
Map.Entry<String, String> entry = entries.next();
3477+
for (Map.Entry<String, String> entry : newOptions.entrySet()) {
34813478
String key = entry.getKey();
3482-
String value = entry.getValue();
3483-
javaModelManager.storePreference(key, value, projectPreferences, newOptions);
3479+
// GROOVY add -- these project options are not persistent
3480+
if (key.startsWith("org.eclipse.jdt.core.compiler.groovy.")) continue; //$NON-NLS-1$
3481+
javaModelManager.storePreference(key, entry.getValue(), projectPreferences, newOptions);
34843482
}
34853483

34863484
// reset to default all options not in new map
34873485
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=26255
34883486
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=49691
3489-
String[] pNames = projectPreferences.keys();
3490-
int ln = pNames.length;
3491-
for (int i=0; i<ln; i++) {
3492-
String key = pNames[i];
3487+
for (String key : projectPreferences.keys()) {
34933488
if (!newOptions.containsKey(key)) {
34943489
projectPreferences.remove(key); // old preferences => remove from preferences table
34953490
}

0 commit comments

Comments
 (0)