Commit a47390ed authored by Lenard Nagy's avatar Lenard Nagy
Browse files

Aligning keys and names of optimalization flags with the value stored in the .TITAN_properties file


Signed-off-by: Lenard Nagy's avatarLenard Nagy (elnrnag) <lenard.nagy@ericsson.com>
parent 096431ce
......@@ -34,7 +34,7 @@ public final class COptimalizationOptionsData {
public static final String[] PROPERTIES = { OPTIMIZATION_LEVEL_PROPERTY, OTHER_OPTIMIZATION_FLAGS_PROPERTY };
public static final String[] TAGS = { PTIMIZATION_LEVEL_TAG, OTHER_OPTIMIZATION_FLAGS_TAG };
public static final String[] DEFAULT_VALUES = { "Common optimizations", "" };
public static final String[] DEFAULT_VALUES = { "Commonoptimizations", "" };
private COptimalizationOptionsData() {
// Do nothing
......@@ -48,13 +48,13 @@ public final class COptimalizationOptionsData {
if (temp != null) {
if ("None".equals(temp)) {
builder.append(" -O0");
} else if ("Minor optimizations".equals(temp)) {
} else if ("Minoroptimizations".equals(temp)) {
builder.append(" -O1");
} else if ("Common optimizations".equals(temp)) {
} else if ("Commonoptimizations".equals(temp)) {
builder.append(" -O2");
} else if ("Optimize for speed".equals(temp)) {
} else if ("Optimizeforspeed".equals(temp)) {
builder.append(" -O3");
} else if ("Optimize for size".equals(temp)) {
} else if ("Optimizeforsize".equals(temp)) {
builder.append(" -Os");
}
}
......
......@@ -53,10 +53,10 @@ public final class COptimalizationOptionsPage implements IOptionsPage {
optimalizationLevel = new ComboFieldEditor(COptimalizationOptionsData.OPTIMIZATION_LEVEL_PROPERTY, "Optimization level",
new String[][] { { "Unspecified", "Unspecified" }, { "None (-O0)", "None" },
{ "Minor optimizations (-O1)", "Minor optimizations" },
{ "Common optimizations (-O2)", "Common optimizations" },
{ "Optimize for speed (-O3)", "Optimize for speed" },
{ "Optimize for size (-Os)", "Optimize for size" } }, mainComposite);
{ "Minor optimizations (-O1)", "Minoroptimizations" },
{ "Common optimizations (-O2)", "Commonoptimizations" },
{ "Optimize for speed (-O3)", "Optimizeforspeed" },
{ "Optimize for size (-Os)", "Optimizeforsize" } }, mainComposite);
otherFlags = new StringFieldEditor(COptimalizationOptionsData.OTHER_OPTIMIZATION_FLAGS_PROPERTY, "Other optimization flags:",
mainComposite);
......@@ -117,7 +117,7 @@ public final class COptimalizationOptionsPage implements IOptionsPage {
}
optimalizationLevel.setEnabled(true, mainComposite);
optimalizationLevel.setSelectedValue("Common optimizations");
optimalizationLevel.setSelectedValue("Commonoptimizations");
otherFlags.setEnabled(true, mainComposite);
otherFlags.setStringValue("");
......@@ -136,14 +136,14 @@ public final class COptimalizationOptionsPage implements IOptionsPage {
if (temp != null && temp.length() != 0) {
optimalizationLevel.setSelectedValue(temp);
} else {
optimalizationLevel.setSelectedValue("Common optimizations");
optimalizationLevel.setSelectedValue("Commonoptimizations");
}
temp = project.getPersistentProperty(new QualifiedName(ProjectBuildPropertyData.QUALIFIER,
COptimalizationOptionsData.OTHER_OPTIMIZATION_FLAGS_PROPERTY));
otherFlags.setStringValue(temp);
} catch (CoreException e) {
optimalizationLevel.setSelectedValue("Common optimizations");
optimalizationLevel.setSelectedValue("Commonoptimizations");
otherFlags.setStringValue("");
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment