Revert Bug 465404: Evaluate RwtScoutColumnModel.isEditableIconNeeded(..) in a
"getUiEnvironment().invokeScoutLater(..)"-Job
diff --git a/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/basic/table/RwtScoutColumnModel.java b/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/basic/table/RwtScoutColumnModel.java
index 9956a85..0b0c240 100644
--- a/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/basic/table/RwtScoutColumnModel.java
+++ b/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/basic/table/RwtScoutColumnModel.java
@@ -11,8 +11,6 @@
import org.eclipse.scout.commons.CollectionUtility;
import org.eclipse.scout.commons.HTMLUtility;
import org.eclipse.scout.commons.StringUtility;
-import org.eclipse.scout.commons.holders.BooleanHolder;
-import org.eclipse.scout.commons.job.JobEx;
import org.eclipse.scout.commons.logger.IScoutLogger;
import org.eclipse.scout.commons.logger.ScoutLogManager;
import org.eclipse.scout.rt.client.ui.basic.cell.ICell;
@@ -22,7 +20,6 @@
import org.eclipse.scout.rt.client.ui.basic.table.columns.IProposalColumn;
import org.eclipse.scout.rt.client.ui.basic.table.columns.IStringColumn;
import org.eclipse.scout.rt.shared.AbstractIcons;
-import org.eclipse.scout.rt.ui.rap.IRwtEnvironment;
import org.eclipse.scout.rt.ui.rap.RwtIcons;
import org.eclipse.scout.rt.ui.rap.extension.UiDecorationExtensionPoint;
import org.eclipse.scout.rt.ui.rap.util.HtmlTextUtility;
@@ -48,9 +45,8 @@
private final Image m_imgCheckboxTrue;
private final Color m_disabledForegroundColor;
private Map<ITableRow, Map<IColumn<?>, P_CachedCell>> m_cachedCells;
- private IRwtEnvironment m_environment;
- public RwtScoutColumnModel(ITable scoutTable, RwtScoutTable uiTable, TableColumnManager columnManager, IRwtEnvironment env) {
+ public RwtScoutColumnModel(ITable scoutTable, RwtScoutTable uiTable, TableColumnManager columnManager) {
m_scoutTable = scoutTable;
m_uiTable = uiTable;
m_columnManager = columnManager;
@@ -58,7 +54,6 @@
m_imgCheckboxFalse = getUiTable().getUiEnvironment().getIcon(RwtIcons.CheckboxNo);
m_disabledForegroundColor = getUiTable().getUiEnvironment().getColor(UiDecorationExtensionPoint.getLookAndFeel().getColorForegroundDisabled());
rebuildCache();
- m_environment = env;
}
protected ITable getScoutTable() {
@@ -325,32 +320,11 @@
return false;
}
- final ITable scoutTable = getScoutTable();
+ ITable scoutTable = getScoutTable();
if (scoutTable == null) {
return false;
}
- final BooleanHolder res = new BooleanHolder(false);
- Runnable runnable = new Runnable() {
- @Override
- public void run() {
- res.setValue(
- scoutTable.isCellEditable(row, column) && !column.getDataType().isAssignableFrom(Boolean.class));
- }
- };
-
- JobEx job = getUiEnvironment().invokeScoutLater(runnable, 0);
- try {
- job.join();
- }
- catch (InterruptedException e) {
- //NOP
- }
-
- return res.getValue();
- }
-
- public IRwtEnvironment getUiEnvironment() {
- return m_environment;
+ return scoutTable.isCellEditable(row, column);
}
private void rebuildCache() {
diff --git a/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/basic/table/RwtScoutTable.java b/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/basic/table/RwtScoutTable.java
index 356f1fd..70cdae0 100644
--- a/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/basic/table/RwtScoutTable.java
+++ b/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/basic/table/RwtScoutTable.java
@@ -193,7 +193,7 @@
protected RwtScoutColumnModel getUiColumnModel() {
if (m_columnModel == null) {
- m_columnModel = new RwtScoutColumnModel(getScoutObject(), this, m_uiColumnManager, getUiEnvironment());
+ m_columnModel = new RwtScoutColumnModel(getScoutObject(), this, m_uiColumnManager);
}
return m_columnModel;
}
