Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsgar Radermacher2013-11-12 13:36:20 +0000
committerAnsgar Radermacher2013-11-12 15:14:46 +0000
commit5e75ed6b9d84932e2f21b15451631aa9c3a3eed7 (patch)
treedb00a6d44974826603325724789f5f100974779d
parent1dea78518bd66a5a53487dbb881b5653c8752197 (diff)
downloadorg.eclipse.papyrus-5e75ed6b9d84932e2f21b15451631aa9c3a3eed7.tar.gz
org.eclipse.papyrus-5e75ed6b9d84932e2f21b15451631aa9c3a3eed7.tar.xz
org.eclipse.papyrus-5e75ed6b9d84932e2f21b15451631aa9c3a3eed7.zip
- Bug 421525 - [CDT integration] it should be possible to open a CDT editor by default on the right: minor typos
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/factory/PapyrusCDTEditorFactory.java2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java7
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java2
3 files changed, 7 insertions, 4 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/factory/PapyrusCDTEditorFactory.java b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/factory/PapyrusCDTEditorFactory.java
index 7ce74ed98f3..9f31853b7ca 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/factory/PapyrusCDTEditorFactory.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/factory/PapyrusCDTEditorFactory.java
@@ -159,7 +159,7 @@ public class PapyrusCDTEditorFactory extends AbstractEditorFactory {
*
*/
public Object getRawModel() {
- return rawModel;
+ return rawEditorModel;
}
/**
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java
index 0fbe22ffee0..1dbf77c02a7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java
@@ -1,5 +1,8 @@
package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;
+
/**
* This interface is used by the sash windows system to discover its content. It is considered
* as the root of the sash windows models.
@@ -106,7 +109,7 @@ public interface ISashWindowsContentProvider {
* Ask the model to move the specified tab to the specified side of the specified targetFolder.
* This method
* is called by the the SashTileContainer when the user
- * have drag a tab in a correct place. The SashTileContainer has not change is presentation yet. This
+ * drags a tab in a correct place. The SashTileContainer has not changed is presentation yet. This
* will be done when the corresponding event will occur.
*
* @param tabFolder
@@ -114,7 +117,7 @@ public interface ISashWindowsContentProvider {
* @param tabIndex
* The index of the tab to move
* @param targetFolder
- * The folder to which the side refer to
+ * The folder to which the side refers to
* @param side
* Side where node should be inserted : SWT.LEFT, SWT.RIGHT, SWT.TOP, SWT.DOWN.
*/
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java
index a1ce94f3d01..35c7316ff8e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java
@@ -189,7 +189,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
protected ISashWindowsContentProvider getContentProvider() {
// Content provider should have been set.
assert (contentProvider != null);
- // Double check for developement
+ // Double check for development
if(contentProvider == null) {
throw new IllegalStateException("ContentProvider should be set before calling any method requiring it.");
}

Back to the top