jh: undo last commit, wrong branch
diff --git a/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIResources.java b/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIResources.java
index 04895bd..bc27915 100644
--- a/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIResources.java
+++ b/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIResources.java
@@ -130,7 +130,6 @@
public static String additionalInfo_text;
public static String application_text;
- public static String practice_application_text;
public static String actionLabel_edit;
diff --git a/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/Resources.properties b/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/Resources.properties
index ed101f0..f192d02 100644
--- a/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/Resources.properties
+++ b/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/Resources.properties
@@ -72,7 +72,6 @@
# UI & Element Attribute Labels
additionalInfo_text=Additional information:
application_text=Application:
-practice_application_text=How to read this practice:
actionLabel_edit=&Edit
actionLabel_findElementInLibNav=&Show in Library View
alternatives_text=Alternatives:
diff --git a/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DescriptionFormPage.java b/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DescriptionFormPage.java
index b31baee..9471bdb 100644
--- a/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DescriptionFormPage.java
+++ b/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/DescriptionFormPage.java
@@ -928,7 +928,7 @@
/**
* Creates the Detail section content.
*/
- protected void createDetailSectionContent() {
+ private void createDetailSectionContent() {
if (purposeOn) {
ctrl_purpose = createRichTextEditWithLinkForSection(toolkit,
detailComposite, AuthoringUIText.PURPOSE_TEXT, 40, 400,
diff --git a/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/GuidanceDescriptionPage.java b/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/GuidanceDescriptionPage.java
index 4d49a70..31af4c5 100644
--- a/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/GuidanceDescriptionPage.java
+++ b/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/GuidanceDescriptionPage.java
@@ -62,7 +62,6 @@
private String elementLabel;
private IMethodRichText ctrl_content;
- protected boolean contentOn = true;
private int contentFieldHeight = 400;
@@ -104,11 +103,9 @@
*/
protected void createEditorContent(FormToolkit toolkit) {
super.createEditorContent(toolkit);
- if (contentOn) {
- ctrl_content = createRichTextEditWithLinkForSection(toolkit,
- detailComposite, AuthoringUIText.MAIN_DESCRIPTION_TEXT,
- contentFieldHeight, 400, DETAIL_SECTION_ID);
- }
+ ctrl_content = createRichTextEditWithLinkForSection(toolkit,
+ detailComposite, AuthoringUIText.MAIN_DESCRIPTION_TEXT,
+ contentFieldHeight, 400, DETAIL_SECTION_ID);
}
/**
@@ -116,42 +113,40 @@
*/
protected void addListeners() {
super.addListeners();
- if (contentOn) {
-
- final MethodElementEditor editor = (MethodElementEditor) getEditor();
-
- ctrl_content.setModalObject(contentElement.getPresentation());
- ctrl_content.setModalObjectFeature(UmaPackage.eINSTANCE
- .getContentDescription_MainDescription());
- ctrl_content.addModifyListener(contentModifyListener);
- ctrl_content.addListener(SWT.Deactivate, new Listener() {
- public void handleEvent(Event e) {
- IMethodRichText control = descExpandFlag ? ctrl_expanded
- : ctrl_content;
- if (!control.getModified()) {
- return;
- }
- String oldContent = guidance.getPresentation()
- .getMainDescription();
- if (((MethodElementEditor) getEditor()).mustRestoreValue(
- control, oldContent)) {
- return;
- }
- String newContent = control.getText();
- if (!newContent.equals(oldContent)) {
- boolean success = editor.getActionManager().doAction(
- IActionManager.SET,
- contentElement.getPresentation(),
- UmaPackage.eINSTANCE
- .getContentDescription_MainDescription(),
- newContent, -1);
- if (success && isVersionSectionOn()) {
- updateChangeDate();
- }
+
+ final MethodElementEditor editor = (MethodElementEditor) getEditor();
+
+ ctrl_content.setModalObject(contentElement.getPresentation());
+ ctrl_content.setModalObjectFeature(UmaPackage.eINSTANCE
+ .getContentDescription_MainDescription());
+ ctrl_content.addModifyListener(contentModifyListener);
+ ctrl_content.addListener(SWT.Deactivate, new Listener() {
+ public void handleEvent(Event e) {
+ IMethodRichText control = descExpandFlag ? ctrl_expanded
+ : ctrl_content;
+ if (!control.getModified()) {
+ return;
+ }
+ String oldContent = guidance.getPresentation()
+ .getMainDescription();
+ if (((MethodElementEditor) getEditor()).mustRestoreValue(
+ control, oldContent)) {
+ return;
+ }
+ String newContent = control.getText();
+ if (!newContent.equals(oldContent)) {
+ boolean success = editor.getActionManager().doAction(
+ IActionManager.SET,
+ contentElement.getPresentation(),
+ UmaPackage.eINSTANCE
+ .getContentDescription_MainDescription(),
+ newContent, -1);
+ if (success && isVersionSectionOn()) {
+ updateChangeDate();
}
}
- });
- }
+ }
+ });
}
/**
@@ -159,9 +154,7 @@
*/
protected void refresh(boolean editable) {
super.refresh(editable);
- if (contentOn) {
- ctrl_content.setEditable(editable);
- }
+ ctrl_content.setEditable(editable);
}
/**
@@ -169,14 +162,12 @@
*/
protected void loadData() {
super.loadData();
- if (contentOn) {
- if (guidance != null) {
- String content = null;
- if (guidance.getPresentation() != null) {
- content = guidance.getPresentation().getMainDescription();
- }
- ctrl_content.setText(content == null ? "" : content); //$NON-NLS-1$
+ if (guidance != null) {
+ String content = null;
+ if (guidance.getPresentation() != null) {
+ content = guidance.getPresentation().getMainDescription();
}
+ ctrl_content.setText(content == null ? "" : content); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/PracticeDescriptionPage.java b/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/PracticeDescriptionPage.java
index ee165ce..67eb05e 100644
--- a/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/PracticeDescriptionPage.java
+++ b/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/forms/PracticeDescriptionPage.java
@@ -10,7 +10,6 @@
//------------------------------------------------------------------------------
package org.eclipse.epf.authoring.ui.forms;
-import org.eclipse.epf.authoring.ui.AuthoringUIResources;
import org.eclipse.epf.authoring.ui.AuthoringUIText;
import org.eclipse.epf.authoring.ui.editors.MethodElementEditor;
import org.eclipse.epf.authoring.ui.richtext.IMethodRichText;
@@ -57,8 +56,6 @@
super.init(site, input);
guidance = (Practice) contentElement;
setContentFieldHeight(200);
- setFullDescOn(true);
- contentOn = false;
}
/**
@@ -66,39 +63,27 @@
*/
protected void createEditorContent(FormToolkit toolkit) {
super.createEditorContent(toolkit);
- label_base.setText(AuthoringUIText.BASE_ELEMENT_TEXT);
- }
-
- @Override
- protected void createDetailSectionContent() {
- // Problem is named "Purpose" in the UI
- ctrl_problem = createRichTextEditWithLinkForSection(toolkit,
- detailComposite, AuthoringUIText.PURPOSE_TEXT, 40, 400,
- DETAIL_SECTION_ID);
+ ctrl_additional_info = createRichTextEditWithLinkForSection(toolkit,
+ detailComposite, AuthoringUIText.ADDITIONAL_INFO_TEXT, 40, 400,
+ DETAIL_SECTION_ID);
ctrl_goals = createRichTextEditWithLinkForSection(toolkit,
detailComposite, AuthoringUIText.GOALS_TEXT, 40, 400,
DETAIL_SECTION_ID);
+ ctrl_application = createRichTextEditWithLinkForSection(toolkit,
+ detailComposite, AuthoringUIText.APPLICATION_TEXT, 40, 400,
+ DETAIL_SECTION_ID);
+ ctrl_problem = createRichTextEditWithLinkForSection(toolkit,
+ detailComposite, AuthoringUIText.PROBLEM_TEXT, 40, 400,
+ DETAIL_SECTION_ID);
ctrl_background = createRichTextEditWithLinkForSection(toolkit,
detailComposite, AuthoringUIText.BACKGROUND_TEXT, 40, 400,
DETAIL_SECTION_ID);
-
- if (fullDescOn) {
- ctrl_full_desc = createRichTextEditWithLinkForSection(toolkit,
- detailComposite, AuthoringUIText.MAIN_DESCRIPTION_TEXT,
- 100, 400, DETAIL_SECTION_ID);
- }
-
- // Application field is called "How to read this practice" in the UI
- ctrl_application = createRichTextEditWithLinkForSection(toolkit,
- detailComposite, AuthoringUIResources.practice_application_text, 40, 400,
- DETAIL_SECTION_ID);
ctrl_levels_adoption = createRichTextEditWithLinkForSection(toolkit,
detailComposite, AuthoringUIText.LEVEL_OF_ADOPTION_TEXT, 40,
400, DETAIL_SECTION_ID);
- ctrl_additional_info = createRichTextEditWithLinkForSection(toolkit,
- detailComposite, AuthoringUIText.ADDITIONAL_INFO_TEXT, 40, 400,
- DETAIL_SECTION_ID);
+
+ label_base.setText(AuthoringUIText.BASE_ELEMENT_TEXT);
}
/**
@@ -323,7 +308,7 @@
ctrl_additional_info.setEditable(editable);
ctrl_application.setEditable(editable);
ctrl_goals.setEditable(editable);
-// ctrl_problem.setEditable(editable);
+ ctrl_problem.setEditable(editable);
ctrl_levels_adoption.setEditable(editable);
ctrl_background.setEditable(editable);
}
