Fix IndexOutOfBound by Diff View (#1814)

Author: TruongQuangSB

java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java

@@ -216,9 +216,16 @@ private void calculateAllMissingTables(final IProgressMonitor monitor) {
 		final TableType tableType = getModelSession().isSingleState()
 				? TableType.SINGLE
 				: TableType.DIFF;
+		if (tableType == TableType.DIFF) {
+			// We don't need create DIFF instance for Errors detecting
+			tableService.transformTables(monitor, getModelSession(),
+					new HashSet<>(missingTables), TableType.INITIAL,
+					controlAreaIds);
+			tableService.transformTables(monitor, getModelSession(),
+					new HashSet<>(missingTables), TableType.FINAL,
+					controlAreaIds);
+		}
 
-		tableService.transformTables(monitor, getModelSession(),
-				new HashSet<>(missingTables), tableType, controlAreaIds);
 	}
 
 	private void openAllTablesWithErrors() {

java/bundles/org.eclipse.set.model.tablemodel.extensions/src/org/eclipse/set/model/tablemodel/extensions/TableExtensions.xtend

@@ -13,9 +13,12 @@ import java.nio.file.Path
 import java.util.Collections
 import java.util.List
 import org.eclipse.emf.common.util.URI
+import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl
+import org.eclipse.emf.ecore.util.EcoreUtil
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
+import org.eclipse.set.model.planpro.Basisobjekte.Bearbeitungsvermerk
 import org.eclipse.set.model.planpro.Basisobjekte.Ur_Objekt
 import org.eclipse.set.model.tablemodel.ColumnDescriptor
 import org.eclipse.set.model.tablemodel.CompareFootnoteContainer
@@ -31,17 +34,16 @@ import static extension org.eclipse.set.model.tablemodel.extensions.ColumnDescri
 import static extension org.eclipse.set.model.tablemodel.extensions.RowGroupExtensions.*
 import static extension org.eclipse.set.model.tablemodel.extensions.TableContentExtensions.*
 import static extension org.eclipse.set.model.tablemodel.extensions.TableRowExtensions.*
-import static extension org.eclipse.set.utils.StringExtensions.*
+import static extension org.eclipse.set.ppmodel.extensions.EObjectExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.utils.IterableExtensions.*
-import org.eclipse.emf.ecore.EObject
-import org.eclipse.emf.ecore.util.EcoreUtil
-import org.eclipse.set.model.planpro.Basisobjekte.Bearbeitungsvermerk
+import static extension org.eclipse.set.utils.StringExtensions.*
 
 /**
  * Extensions for {@link Table}.
  */
 class TableExtensions {
 	public static val String FOOTNOTE_SEPARATOR = "; "
+
 	/**
 	 * @param columnLabels the column labels
 	 * 
@@ -282,8 +284,10 @@ class TableExtensions {
 	static def TableRow getMatchingRow(Table table, TableRow row) {
 		val group = row.group
 		val rowIndex = group.rows.indexOf(row)
-		return table.getGroupByLeadingObject(group.leadingObject,
-			group.leadingObjectIndex)?.rows?.get(rowIndex)
+		table.getGroupByLeadingObject(group.leadingObject,
+			group.leadingObjectIndex)?.rows?.
+			getIndexOutBoundableObject(rowIndex)?.orElse(null)
+
 	}
 
 	/**
@@ -477,7 +481,7 @@ class TableExtensions {
 			if (fc instanceof SimpleFootnoteContainer) {
 				val remarks = fc.footnotes.map[getFootnoteInfo(table, it)].
 					filterNull
-					
+
 				return remarks.isEmpty ||
 					remarks.map[toText].join(", ").length < maxCharInCell
 			}
@@ -501,8 +505,9 @@ class TableExtensions {
 					case 1: {
 						val remarks = notEmptyContainer.firstOrNull.map[toText].
 							filterNull
-						return remarks.isEmpty || 
-							remarks.join(FOOTNOTE_SEPARATOR).length < maxCharInCell
+						return remarks.isEmpty ||
+							remarks.join(FOOTNOTE_SEPARATOR).length <
+								maxCharInCell
 					}
 					default:
 						false

java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/EObjectExtensions.xtend

@@ -8,6 +8,7 @@
  */
 package org.eclipse.set.ppmodel.extensions
 
+import java.util.List
 import java.util.Optional
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.EStructuralFeature
@@ -129,7 +130,21 @@ class EObjectExtensions {
 		try {
 			return Optional.ofNullable(func.apply(t))
 		} catch(NullPointerException e) {
+			logger.debug(e.message)
 			return Optional.empty
 		}
 	}
+	
+	static def <T> Optional<T> getIndexOutBoundableObject(List<T> t, int index) {
+		try {
+			if (t.isNullOrEmpty) {
+				return Optional.empty
+			}
+			return Optional.ofNullable(t.get(index))
+		} catch (IndexOutOfBoundsException e) {
+			logger.debug(e.message)
+			return Optional.empty
+		}
+		
+	}
 }