Attachment 92926 Details for Bug 196219 – Patch file

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch file

tptp_patch_bugzilla196219_20080319.txt (text/plain), 5.70 KB, created by Yasuhisa Gotoh

on 2008-03-19 11:52:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhisa Gotoh

Created: 2008-03-19 11:52:02 EDT

Size: 5.70 KB

patch

obsolete

>Index: src/org/eclipse/tptp/symptom/internal/presentation/SymptomDefinitonDetails.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.sdb/src/org/eclipse/tptp/symptom/internal/presentation/SymptomDefinitonDetails.java,v
>retrieving revision 1.22
>diff -u -r1.22 SymptomDefinitonDetails.java
>--- src/org/eclipse/tptp/symptom/internal/presentation/SymptomDefinitonDetails.java	31 Jan 2008 02:26:10 -0000	1.22
>+++ src/org/eclipse/tptp/symptom/internal/presentation/SymptomDefinitonDetails.java	19 Mar 2008 15:42:31 -0000
>@@ -96,41 +96,66 @@
> 	}
> 
> 	public void refresh() {
>-		if (!(wrappedObject instanceof SymptomDefinition))
>+		// Bug 196219
>+		// wrappedObject can be null and if so, all fields should be cleared
>+		if ((wrappedObject != null) && (!(wrappedObject instanceof SymptomDefinition)))
> 			return;
> 		refresh = true;//		
> 		if (name != null) {
>-			name
>+			if (wrappedObject == null) {
>+				name.setText("");
>+			} else {
>+				name
> 					.setText(((SymptomDefinition) wrappedObject).getName() != null ? ((SymptomDefinition) wrappedObject)
> 							.getName()
> 							: "");
>+			}
> 		}
> 		if (version != null) {
>-			version
>+			if (wrappedObject == null) {
>+				version.setText("");
>+			} else {
>+				version
> 					.setText(((SymptomDefinition) wrappedObject).getVersion() != null ? ((SymptomDefinition) wrappedObject)
> 							.getVersion()
> 							: defaultVersion);
>+			}
> 		}
> 		if (description != null) {
>-			description
>+			if (wrappedObject == null) {
>+				description.setText("");
>+			} else {
>+				description
> 					.setText(((SymptomDefinition) wrappedObject)
> 							.getDescription() != null
> 							&& ((SymptomDefinition) wrappedObject)
> 									.getDescription().getMessage() != null ? ((SymptomDefinition) wrappedObject)
> 							.getDescription().getMessage()
> 							: "");
>+			}
> 		}
> 		if (editor!=null ||(editor==null && isAttributeVisible(SdUIConstants.SymptomDef_comments))) {
>-			refreshComments(((SymptomDefinition) wrappedObject).getComment());
>+			if (wrappedObject == null) {
>+				refreshComments(new ArrayList());
>+			} else {
>+				refreshComments(((SymptomDefinition) wrappedObject).getComment());
>+			}
> 		}
> 
> 		if (url != null) {
>-			url
>+			if (wrappedObject == null) {
>+				url.setText("");
>+			} else {
>+				url
> 					.setText(((SymptomDefinition) wrappedObject).getUrl() != null ? TextProcessor.process(((SymptomDefinition) wrappedObject)
> 							.getUrl())
> 							: "");//added osgi TextProcessor for correct BiDi path processing Bugzilla 152590
>+			}
> 		}
> 		if (mirror != null) {
>+			if (wrappedObject == null) {
>+				mirror.setText("");
>+			} else {
> 			List mirrors = ((SymptomDefinition) wrappedObject).getMirror();
> 			int s = mirrors.size();
> 			StringBuffer mirrorsBuffer = new StringBuffer();
>@@ -151,15 +176,23 @@
> 			}
> 
> 			mirror.setText(TextProcessor.process(mirrorsBuffer.toString()));//added osgi TextProcessor for correct BiDi path processing Bugzilla 152590
>+			}
> 		}
> 		if (category != null) {
>-			category
>+			if (wrappedObject == null) {
>+				category.setText("");
>+			} else {
>+				category
> 					.setText(((SymptomDefinition) wrappedObject).getCategory() != null ? ((SymptomDefinition) wrappedObject)
> 							.getCategory().toString()
> 							: DEFAULT_CATEGORY);
>+			}
> 		}
> 		
> 		if(context!=null){
>+			if (wrappedObject == null) {
>+				context.setText("");
>+			} else {
> 			List contextList = ((SymptomDefinition) wrappedObject).getContext();
> 			int s = contextList.size();
> 			StringBuffer contextBuffer = new StringBuffer();
>@@ -180,30 +213,43 @@
> 			}
> 
> 			context.setText(contextBuffer.toString());
>+			}
> 		}
> 		if (resource != null) {
>-			resource
>+			if (wrappedObject == null) {
>+				resource.setText("");
>+			} else {
>+				resource
> 					.setText(((SymptomDefinition) wrappedObject).getResource() != null ? ((SymptomDefinition) wrappedObject)
> 							.getResource()
> 							: "");
>+			}
> 		}
> 		
> 		
> 		if (example != null) {
>-			example
>+			if (wrappedObject == null) {
>+				example.setText("");
>+			} else {
>+				example
> 					.setText(((SymptomDefinition) wrappedObject).getExample() != null
> 							&& ((SymptomDefinition) wrappedObject).getExample()
> 									.getMessage() != null ? ((SymptomDefinition) wrappedObject)
> 							.getExample().getMessage()
> 							: "");
>+			}
> 		}
> 		if (solution != null) {
>-			solution
>+			if (wrappedObject == null) {
>+				solution.setText("");
>+			} else {
>+				solution
> 					.setText(((SymptomDefinition) wrappedObject).getSolution() != null
> 							&& ((SymptomDefinition) wrappedObject)
> 									.getSolution().getMessage() != null ? ((SymptomDefinition) wrappedObject)
> 							.getSolution().getMessage()
> 							: "");
>+			}
> 		}
> 		refresh = false;
> 	}
>Index: src/org/eclipse/tptp/symptom/internal/presentation/CommonDetailsPage.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.sdb/src/org/eclipse/tptp/symptom/internal/presentation/CommonDetailsPage.java,v
>retrieving revision 1.25
>diff -u -r1.25 CommonDetailsPage.java
>--- src/org/eclipse/tptp/symptom/internal/presentation/CommonDetailsPage.java	5 Mar 2008 19:37:33 -0000	1.25
>+++ src/org/eclipse/tptp/symptom/internal/presentation/CommonDetailsPage.java	19 Mar 2008 15:42:31 -0000
>@@ -237,8 +237,10 @@
> 					if(selObj instanceof Comment){
> 						currentComment = (Comment)selObj;
> 						txtComment.setText(currentComment!=null && currentComment.getComment()!=null ? currentComment.getComment() : "");						
>+						return;
> 					}
> 				}
>+				txtComment.setText("");
> 			};
> 		});
> 		commentsViewer.setSorter(getSorter(TIME_STAMP));

Actions: View | Diff

Attachments on bug 196219: 73586 | 92926