[28078] Diagnose-Editor: Vorladen, Zeilenabstand, Suchdialog (#952)

Author: Daksic28

bundles/ch.elexis.core.findings.ui/src/ch/elexis/core/findings/ui/composites/ConditionComposite.java

@@ -131,6 +131,12 @@ private void initDataBinding() {
 		setCondition(null);
 	}
 
+	public void preload() {
+		if (textEditor != null && !textEditor.isDisposed()) {
+			textEditor.preload();
+		}
+	}
+
 	public Optional<ICondition> getCondition() {
 		if (conditionValue.getValue() != null) {
 			conditionValue.getValue().setText(textEditor.getText());
@@ -145,9 +151,7 @@ public void setCondition(final ICondition condition) {
 			conditionValue.setValue(new ConditionBeanAdapter(condition));
 			// show coding if present
 			List<ICoding> coding = this.condition.get().getCoding();
-			if (coding != null && !coding.isEmpty()) {
-				textOrCodingFolder.setSelection(1);
-			}
+			textOrCodingFolder.setSelection(coding != null && !coding.isEmpty() ? 1 : 0);
 		} else {
 			ICondition emptyCondition = FindingsServiceComponent.getService().create(ICondition.class);
 			emptyCondition.setStatus(ConditionStatus.ACTIVE);

bundles/ch.elexis.core.findings.ui/src/ch/elexis/core/findings/ui/composites/DiagnoseListComposite.java

@@ -10,6 +10,7 @@
  ******************************************************************************/
 package ch.elexis.core.findings.ui.composites;
 
+import java.lang.reflect.InvocationTargetException;
 import java.time.LocalDate;
 import java.util.Comparator;
 import java.util.List;
@@ -22,6 +23,7 @@
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -34,8 +36,10 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.slf4j.LoggerFactory;
 
 import ca.odell.glazedlists.BasicEventList;
 import ca.odell.glazedlists.EventList;
@@ -50,15 +54,16 @@
 import ch.elexis.core.findings.ui.services.CodingServiceComponent;
 import ch.elexis.core.findings.ui.services.FindingsServiceComponent;
 import ch.elexis.core.l10n.Messages;
+import ch.elexis.core.lock.types.LockResponse;
 import ch.elexis.core.model.IPatient;
 import ch.elexis.core.services.LocalConfigService;
 import ch.elexis.core.services.holder.ConfigServiceHolder;
 import ch.elexis.core.services.holder.ContextServiceHolder;
 import ch.elexis.core.text.docx.util.TextUtil;
 import ch.elexis.core.ui.icons.Images;
-import ch.elexis.core.ui.locks.AcquireLockBlockingUi;
 import ch.elexis.core.ui.locks.AcquireLockUi;
 import ch.elexis.core.ui.locks.ILockHandler;
+import ch.elexis.core.ui.locks.LockResponseHelper;
 import ch.elexis.core.ui.util.NatTableFactory;
 import ch.elexis.core.ui.util.NatTableWrapper;
 import ch.elexis.core.ui.util.NatTableWrapper.IDoubleClickListener;
@@ -76,6 +81,12 @@ public class DiagnoseListComposite extends Composite {
 	private NatTableWrapper natTableWrapper;
 	private ToolBarManager toolbarManager;
 
+	private ConditionEditDialog editDialog;
+
+	private static final String PROPERTY_PRELOAD = "elexis.diagnose.preloadEditor"; //$NON-NLS-1$
+
+	private static final int PRELOAD_DELAY_MILLIS = 1500;
+
 	private EventList<ICondition> dataList = new BasicEventList<>();
 
 	@SuppressWarnings("deprecation")
@@ -120,32 +131,36 @@ private Object getAlternativeFormattedText(ICondition condition) {
 
 						ConditionStatus status = condition.getStatus();
 						text.append(status.getLocalized());
-						text.append("<br/>");
+						StringBuilder secondLine = new StringBuilder();
 						Optional<String> start = condition.getStart();
 						if (start.isPresent() && StringUtils.isNotBlank(start.get())) {
-							text.append(start.get());
+							secondLine.append(start.get());
 						}
 
 						Optional<String> end = condition.getEnd();
 						if (end.isPresent() && StringUtils.isNotBlank(end.get())) {
-							text.append(" - ").append(end.get());
+							secondLine.append(" - ").append(end.get());
 						}
 
 						List<ICoding> codings = condition.getCoding();
 						if (codings != null && !codings.isEmpty()) {
 							for (ICoding iCoding : codings) {
-								text.append(" [").append(CodingServiceComponent.getService().getShortLabel(iCoding))
+								secondLine.append(" [")
+										.append(CodingServiceComponent.getService().getShortLabel(iCoding))
 										.append("]");
 							}
 						}
+						if (secondLine.length() > 0) {
+							text.append("<br/>").append(secondLine);
+						}
 						text.append("</strong>");
 
 						boolean hasText = condition.getText().isPresent()
 								&& StringUtils.isNotBlank(condition.getText().get());
 						boolean hasNotes = !condition.getNotes().isEmpty();
 
 						if (hasText || hasNotes) {
-							text.append("<br/><br/>");
+							text.append("<p><br/>");
 						}
 
 						if (hasText) {
@@ -162,8 +177,6 @@ private Object getAlternativeFormattedText(ICondition condition) {
 							}
 						}
 
-						text.append("<br/>");
-
 						return text.toString();
 					}
 
@@ -226,23 +239,11 @@ public void setDataValue(ICondition condition, int arg1, Object arg2) {
 			public void doubleClick(NatTableWrapper source, ISelection selection) {
 				if (selection instanceof StructuredSelection && !selection.isEmpty()) {
 					ICondition condition = (ICondition) ((StructuredSelection) selection).getFirstElement();
-					AcquireLockBlockingUi.aquireAndRun(condition, new ILockHandler() {
-						@Override
-						public void lockFailed() {
-							// do nothing
-						}
-
-						@Override
-						public void lockAcquired() {
-							ConditionEditDialog dialog = new ConditionEditDialog(condition,
-									Display.getDefault().getActiveShell());
-							if (dialog.open() == Dialog.OK) {
-								dialog.getCondition().ifPresent(c -> {
-									source.getNatTable().refresh();
-								});
-							}
-						}
-					});
+					if (editDialog != null && editDialog.isOpen()) {
+						editDialog.getShell().setActive();
+						return;
+					}
+					editCondition(condition, source);
 				}
 			}
 		});
@@ -258,6 +259,95 @@ public void lockAcquired() {
 		ToolBar toolbar = toolbarManager.createControl(this);
 		toolbar.setLayoutData(new GridData(SWT.RIGHT, SWT.TOP, false, false));
 		toolbar.setBackground(parent.getBackground());
+
+		addDisposeListener(e -> disposeEditDialog());
+	}
+
+	/**
+	 * Locks the condition, edits it, releases the lock. The lock is acquired exactly
+	 * as {@code AcquireLockBlockingUi} does it blocking, with a cancelable progress
+	 * dialog but that dialog is closed again before the editor opens, and the lock
+	 * is only released once editing is done.
+	 * <p>
+	 * The order is what makes a kept editor possible at all. {@code AcquireLockBlockingUi}
+	 * calls its handler while its progress dialog is still up, and that dialog is
+	 * application modal and disposed right afterwards: an editor built next to it would
+	 * be blocked by its modality, and one built below it would be disposed with it.
+	 * Since {@link ICondition} is an {@code Identifiable}, it takes the overload without
+	 * the standalone shortcut, so that progress dialog appears even without a lock server.
+	 */
+	private void editCondition(ICondition condition, NatTableWrapper source) {
+		LockResponse lockResponse = acquireLockBlocking(condition);
+		if (lockResponse == null) {
+			return;
+		}
+		if (!lockResponse.isOk()) {
+			LockResponseHelper.showInfo(lockResponse, condition, LoggerFactory.getLogger(getClass()));
+			return;
+		}
+		try {
+			if (openEditDialog(condition, condition.getCategory(), getShell()) == Dialog.OK && editDialog != null) {
+				editDialog.getCondition().ifPresent(c -> {
+					source.getNatTable().refresh();
+				});
+			}
+		} finally {
+			LocalLockServiceHolder.get().releaseLock(lockResponse.getLockInfo());
+		}
+	}
+
+	private LockResponse acquireLockBlocking(ICondition condition) {
+		LockResponse[] result = new LockResponse[1];
+		try {
+			new ProgressMonitorDialog(getShell()).run(true, true,
+					monitor -> result[0] = LocalLockServiceHolder.get().acquireLockBlocking(condition, 30, monitor));
+		} catch (InvocationTargetException | InterruptedException e) {
+			LoggerFactory.getLogger(getClass()).warn("Exception during acquire lock.", e); //$NON-NLS-1$
+			return null;
+		}
+		return result[0];
+	}
+	
+	private int openEditDialog(ICondition condition, ConditionCategory category, Shell parentShell) {
+		if (editDialog != null && !editDialog.canReuseFor(parentShell, category)) {
+			disposeEditDialog();
+		}
+		if (editDialog == null) {
+			editDialog = condition != null ? new ConditionEditDialog(condition, parentShell)
+					: new ConditionEditDialog(category, parentShell);
+			editDialog.setReusable(true);
+		} else {
+			editDialog.setCondition(condition);
+		}
+		return editDialog.open();
+	}
+
+	private void disposeEditDialog() {
+		if (editDialog != null) {
+			editDialog.dispose();
+			editDialog = null;
+		}
+	}
+
+	private void preloadEditDialog() {
+		if (editDialog != null || isDisposed() || getShell() == null
+				|| !Boolean.parseBoolean(System.getProperty(PROPERTY_PRELOAD, Boolean.TRUE.toString()))) {
+			return;
+		}
+		getDisplay().timerExec(PRELOAD_DELAY_MILLIS, () -> {
+			if (editDialog != null || isDisposed() || getShell() == null || getShell().isDisposed()) {
+				return;
+			}
+			try {
+				ConditionEditDialog preloaded = new ConditionEditDialog(ConditionCategory.PROBLEMLISTITEM, getShell());
+				preloaded.setReusable(true);
+				preloaded.preload();
+				editDialog = preloaded;
+			} catch (Exception e) {
+				LoggerFactory.getLogger(getClass()).warn("Could not preload the condition dialog", e); //$NON-NLS-1$
+				disposeEditDialog();
+			}
+		});
 	}
 
 	private static void appendFormattedLine(StringBuilder text, String line) {
@@ -286,6 +376,8 @@ public int compare(ICondition left, ICondition right) {
 		dataList.addAll(conditions);
 		natTableWrapper.getNatTable().refresh();
 
+		preloadEditDialog();
+
 		Display.getDefault().asyncExec(() -> {
 			if (!isDisposed()) {
 				Composite parent = getParent();
@@ -396,9 +488,13 @@ public String getText() {
 		public void run() {
 			IPatient selectedPatient = ContextServiceHolder.get().getActivePatient().orElse(null);
 			if (selectedPatient != null) {
-				ConditionEditDialog dialog = new ConditionEditDialog(ConditionCategory.PROBLEMLISTITEM, getShell());
-				if (dialog.open() == Dialog.OK) {
-					dialog.getCondition().ifPresent(c -> {
+				if (editDialog != null && editDialog.isOpen()) {
+					editDialog.getShell().setActive();
+					return;
+				}
+				if (openEditDialog(null, ConditionCategory.PROBLEMLISTITEM, getShell()) == Dialog.OK
+						&& editDialog != null) {
+					editDialog.getCondition().ifPresent(c -> {
 						c.setPatientId(selectedPatient.getId());
 						FindingsServiceComponent.getService().saveFinding(c);
 						// touch after creation