coloring refined

2 files changed, 3 insertions, 4 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/highlight/ColorCalculator.xtend b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/highlight/ColorCalculator.xtend
index d0f9db88..5c871a78 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/highlight/ColorCalculator.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/highlight/ColorCalculator.xtend
@@ -9,7 +9,7 @@ class ColorCalculator {
         

         public def dispatch getColor(EClass c) {

                 val supertypes = (c.getEAllSuperTypes + #[c])

-                val typeHashcodes = supertypes.map[(c.getEPackage.nsURI->c.name).hashCode]

+                val typeHashcodes = supertypes.map[(c.getEPackage.nsURI->c.name).hashCode+2]

                 return randomColor(typeHashcodes)

         }

         public def dispatch getColor(EEnum e) {

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/highlight/MetamodelElementColoringTextAttributeProvider.xtend b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/highlight/MetamodelElementColoringTextAttributeProvider.xtend
index 10b96d02..d843b904 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/highlight/MetamodelElementColoringTextAttributeProvider.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/highlight/MetamodelElementColoringTextAttributeProvider.xtend
@@ -8,9 +8,8 @@ import org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreAccess
 import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightingConfiguration

 import org.eclipse.xtext.ui.editor.syntaxcoloring.PreferenceStoreAccessor

 import org.eclipse.xtext.ui.editor.syntaxcoloring.TextAttributeProvider

-import org.eclipse.xtext.ui.editor.utils.TextStyle

 import org.eclipse.xtext.ui.editor.utils.EditorUtils

-import org.eclipse.swt.SWT

+import org.eclipse.xtext.ui.editor.utils.TextStyle

 

 class MetamodelElementColoringTextAttributeProvider extends TextAttributeProvider{

         

@@ -50,7 +49,7 @@ class MetamodelElementColoringTextAttributeProvider extends TextAttributeProvide
                 return new TextAttribute(

                         EditorUtils.colorFromRGB(defaultTextStyle.color),

                         EditorUtils.colorFromRGB(backgroundColor),

-                        defaultTextStyle.style.bitwiseAnd(SWT.BORDER),

+                        defaultTextStyle.style,

                         EditorUtils.fontFromFontData(defaultTextStyle.getFontData()));

         }

 }