diff --git a/.idea/misc.xml b/.idea/misc.xml
index b755d8ca46c060cb7a2b6b29b7ec83e02b8b71e2..51e5191ed4bd4e6ffe2a1823753c5d6f92894ab9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -38,7 +38,7 @@
       <property name="caretWidth" class="java.lang.Integer" />
     </properties>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/ui/avatarad/AvatarADPanel.java b/src/main/java/ui/avatarad/AvatarADPanel.java
index a45b09bfcc201193d63fa4277fbe1a2dcbc733f8..513db7cbdc5d3d52cc9577e3524653f5545679b3 100644
--- a/src/main/java/ui/avatarad/AvatarADPanel.java
+++ b/src/main/java/ui/avatarad/AvatarADPanel.java
@@ -172,7 +172,7 @@ public class AvatarADPanel extends TDiagramPanel implements TDPWithAttributes{
         y = ontheLeft.getY();
         iterator = componentList.listIterator();
         while(iterator.hasNext()) {
-            tgc = (TGComponent)(iterator.next());
+            tgc = iterator.next();
             if ((tgc instanceof AvatarADPartition) && (tgc !=  ontheLeft)){
                 tgc.setCd(tgc.getX(), y);
             }
diff --git a/src/main/java/ui/window/JDialogPerformancePragma.java b/src/main/java/ui/window/JDialogPerformancePragma.java
index ba2dc8421e29308eeea7cdc4d6a38d64ab1f3d76..a828e59f77f9b1d5f25d6e6e2e461181502e1e42 100644
--- a/src/main/java/ui/window/JDialogPerformancePragma.java
+++ b/src/main/java/ui/window/JDialogPerformancePragma.java
@@ -167,7 +167,7 @@ public class JDialogPerformancePragma extends JDialogBase implements ActionListe
             }
             if (list.getSelectedValue() != null) {
                 try {
-                    final String selectedSuggestion = ((String) list.getSelectedValue()).substring(subWord.length());
+                    final String selectedSuggestion = (list.getSelectedValue()).substring(subWord.length());
                     textarea.getDocument().insertString(insertionPosition, selectedSuggestion, null);
                     return true;
                 } catch (BadLocationException e1) {
diff --git a/src/main/java/ui/window/JDialogPragma.java b/src/main/java/ui/window/JDialogPragma.java
index 04d1b1fd37477f8bb5205460969104891e85b809..e5e5967e9d9230a52e6a0eaafebbdbbb0ddf94a6 100644
--- a/src/main/java/ui/window/JDialogPragma.java
+++ b/src/main/java/ui/window/JDialogPragma.java
@@ -197,7 +197,7 @@ public class JDialogPragma extends JDialogBase implements ActionListener {
             }
             if (list.getSelectedValue() != null) {
                 try {
-                    final String selectedSuggestion = ((String) list.getSelectedValue()).substring(subWord.length());
+                    final String selectedSuggestion = ( list.getSelectedValue()).substring(subWord.length());
                     textarea.getDocument().insertString(insertionPosition, selectedSuggestion, null);
                     return true;
                 } catch (BadLocationException e1) {
diff --git a/src/main/java/ui/window/JDialogSafetyPragma.java b/src/main/java/ui/window/JDialogSafetyPragma.java
index 6bb6c760e31f1101c3d23fd23b87893a7ced55ce..2f95073cee6edc4aee4adaa75515b0f24617c720 100644
--- a/src/main/java/ui/window/JDialogSafetyPragma.java
+++ b/src/main/java/ui/window/JDialogSafetyPragma.java
@@ -175,7 +175,7 @@ public class JDialogSafetyPragma extends JDialogBase implements ActionListener {
             }
             if (list.getSelectedValue() != null) {
                 try {
-                    final String selectedSuggestion = ((String) list.getSelectedValue()).substring(subWord.length());
+                    final String selectedSuggestion = ( list.getSelectedValue()).substring(subWord.length());
                     textarea.getDocument().insertString(insertionPosition, selectedSuggestion, null);
                     return true;
                 } catch (BadLocationException e1) {