Attachment 217288 Details for Bug 382104 – the new patch after review

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

the new patch after review

patch382104_2.txt (text/plain), 5.28 KB, created by libing wang

on 2012-06-13 11:07:31 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: libing wang

Created: 2012-06-13 11:07:31 EDT

Size: 5.28 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.core/web/orion/compare/compare-features.js b/bundles/org.eclipse.orion.client.core/web/orion/compare/compare-features.js
>index 1624138..c8b10e9 100644
>--- a/bundles/org.eclipse.orion.client.core/web/orion/compare/compare-features.js
>+++ b/bundles/org.eclipse.orion.client.core/web/orion/compare/compare-features.js
>@@ -10,7 +10,7 @@
>  *     IBM Corporation - initial API and implementation
>  *******************************************************************************/
> 
>-define(['i18n!orion/compare/nls/messages', 'dojo', 'dijit', 'dijit/layout/ContentPane', 'dijit/layout/BorderContainer'], function(messages, dojo, dijit) {
>+define(['i18n!orion/compare/nls/messages', 'orion/util', 'dojo', 'dijit', 'dijit/layout/ContentPane', 'dijit/layout/BorderContainer'], function(messages, mUtil, dojo, dijit) {
> 
> 
> var orion = orion || {};
>@@ -157,6 +157,7 @@
> 			topWidget.addChild(leftB);
> 			topWidget.addChild(rightB);
> 			topWidget.startup();
>+			mUtil.forceLayout(this._parentDivID);
> 		},
> 		
> 		destroy: function(){
>diff --git a/bundles/org.eclipse.orion.client.core/web/orion/searchExplorer.js b/bundles/org.eclipse.orion.client.core/web/orion/searchExplorer.js
>index 3dbdad6..7612304 100644
>--- a/bundles/org.eclipse.orion.client.core/web/orion/searchExplorer.js
>+++ b/bundles/org.eclipse.orion.client.core/web/orion/searchExplorer.js
>@@ -1120,7 +1120,6 @@
> 			dojo.when(fType, function(fType) {
> 				var options = {
> 					readonly: true,
>-					onPage: true,
> 					hasConflicts: false,
> 					newFile: {
> 						Name: fileItem.location,
>diff --git a/bundles/org.eclipse.orion.client.core/web/stringexternalizer/searchExplorer.js b/bundles/org.eclipse.orion.client.core/web/stringexternalizer/searchExplorer.js
>index 238355b..34e3624 100644
>--- a/bundles/org.eclipse.orion.client.core/web/stringexternalizer/searchExplorer.js
>+++ b/bundles/org.eclipse.orion.client.core/web/stringexternalizer/searchExplorer.js
>@@ -71,7 +71,7 @@
> 			}
> 			for(var j=0; j<this._listRoot.children[i].nonnls.length; j++){
> 				this._listRoot.children[i].nonnls[j].type = "detail"; //$NON-NLS-0$
>-				this._listRoot.children[i].nonnls[j].parent = fileClone;
>+				this._listRoot.children[i].nonnls[j].parent = this._listRoot.children[i];//.parent is reserved for tree visitor
> 				this._listRoot.children[i].nonnls[j].parentNum = i;
> 				this._listRoot.children[i].nonnls[j].checked = true;
> 			}
>@@ -137,7 +137,9 @@
> 		} else if (parentItem.type === "detail") { //$NON-NLS-0$
> 			onComplete([]);
> 		} else if (parentItem.type === "file") { //$NON-NLS-0$
>-			 onComplete(parentItem.nonnls);
>+			parentItem.children = parentItem.nonnls;//Tree iterator (visitor) requires .children property. But this will be improved in the future without requiring this property.
>+			                                        //Addressed in https://bugs.eclipse.org/bugs/show_bug.cgi?id=380687#c2.
>+			onComplete(parentItem.nonnls);
> 		} else {
> 			onComplete([]);
> 		}
>@@ -625,33 +627,34 @@
> 				var options = {
> 					readonly: true,
> 					hasConflicts: false,
>-					baseFile: {
>+					newFile: {
> 						Name: fileItem.Location,
> 						Type: fType,
> 						Content: fileItem.contents
> 					},
>-					newFile: {
>+					baseFile: {
> 						Name: fileItem.Location,
> 						Type: fType,
> 						Content: fileItem.checked ? mNonnlsSearchUtil.replaceNls(fileItem.contents, fileItem.nonnls, that.config) : fileItem.contents
> 					}
> 				};
>+				
> 				if(!that.twoWayCompareContainer){
> 					that.uiFactoryCompare = new mCompareFeatures.TwoWayCompareUIFactory({
> 						parentDivID: uiFactory.getCompareDivID(),
> 						showTitle: true,
>-						leftTitle: dojo.string.substitute(messages["Replaced File (${0})"], [fileItem.Name]),
>-						rightTitle: dojo.string.substitute(messages["Original File (${0})"], [fileItem.Name]),
>+						rightTitle: dojo.string.substitute(messages["Replaced File (${0})"], [fileItem.Name]),
>+						leftTitle: dojo.string.substitute(messages["Original File (${0})"], [fileItem.Name]),
> 						showLineStatus: false
> 					});
> 					that.uiFactoryCompare.buildUI();
> 					that.twoWayCompareContainer = new mCompareContainer.TwoWayCompareContainer(that.registry, uiFactory.getCompareDivID(), that.uiFactoryCompare, options);
> 					that.twoWayCompareContainer.startup();
> 				} else {
>-					dojo.empty(that.uiFactoryCompare.getTitleDivId(true));
>-					dojo.place(document.createTextNode(dojo.string.substitute(messages['Replaced File (${0})'], [fileItem.Name])), that.uiFactoryCompare.getTitleDivId(true), "only"); //$NON-NLS-1$
> 					dojo.empty(that.uiFactoryCompare.getTitleDivId());
>-					dojo.place(document.createTextNode(dojo.string.substitute(messages['Original File (${0})'], [fileItem.Name])), that.uiFactoryCompare.getTitleDivId(), "only"); //$NON-NLS-1$
>+					dojo.place(document.createTextNode(dojo.string.substitute(messages['Replaced File (${0})'], [fileItem.Name])), that.uiFactoryCompare.getTitleDivId(), "only"); //$NON-NLS-1$
>+					dojo.empty(that.uiFactoryCompare.getTitleDivId(true));
>+					dojo.place(document.createTextNode(dojo.string.substitute(messages['Original File (${0})'], [fileItem.Name])), that.uiFactoryCompare.getTitleDivId(true), "only"); //$NON-NLS-1$
> 					that.twoWayCompareContainer.setOptions(options);
> 					that.twoWayCompareContainer.setEditor();
> 				}

Actions: View

Attachments on bug 382104: 217288