Commit 54fdfc75 authored by Marco Descher's avatar Marco Descher
Browse files

[17137] COAd via component, remove console application

parent 486a7eb9

bundles/ch.elexis.core.application/src/ch/elexis/core/application/Desk.java

+4 −4
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import ch.elexis.core.constants.ElexisSystemPropertyConstants; 
import ch.elexis.core.constants.Preferences;

import ch.elexis.core.data.activator.CoreHub;

import ch.elexis.core.data.events.ElexisEventDispatcher;

import ch.elexis.core.data.extension.AbstractCoreOperationAdvisor;

import ch.elexis.core.data.extension.CoreOperationExtensionPoint;

import ch.elexis.core.data.extension.CoreOperationAdvisorHolder;

import ch.elexis.core.data.extension.ICoreOperationAdvisor;

import ch.elexis.core.data.preferences.CorePreferenceInitializer;

import ch.elexis.core.data.util.LocalLock;

import ch.elexis.core.services.IElexisDataSource;
@@ -44,7 +44,7 @@ public class Desk implements IApplication { 
	private Logger log = LoggerFactory.getLogger(Desk.class);

	private static Map<String, String> args = null;

	

	protected static AbstractCoreOperationAdvisor cod = null;

	protected static ICoreOperationAdvisor cod = null;

	

	/**

	 * @since 3.0.0 log-in has been moved from ApplicationWorkbenchAdvisor to this method
@@ -56,7 +56,7 @@ public class Desk implements IApplication { 
		new CoreEventListenerRegistrar();

		

		// Check if we "are complete" - throws Error if not

		cod = CoreOperationExtensionPoint.getCoreOperationAdvisor();

		cod = CoreOperationAdvisorHolder.get();

		

		if(System.getProperty(ElexisSystemPropertyConstants.OPEN_DB_WIZARD)!=null) {

			cod.requestDatabaseConnectionConfiguration();

bundles/ch.elexis.core.application/src/ch/elexis/core/application/advisors/ApplicationWorkbenchAdvisor.java

+3 −7
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ import org.slf4j.Logger; 
import org.slf4j.LoggerFactory;



import ch.elexis.core.data.events.ElexisEventDispatcher;

import ch.elexis.core.data.extension.AbstractCoreOperationAdvisor;

import ch.elexis.core.data.extension.CoreOperationExtensionPoint;

import ch.elexis.core.data.extension.CoreOperationAdvisorHolder;

import ch.elexis.core.ui.Hub;

import ch.elexis.core.ui.UiDesk;

import ch.elexis.core.ui.actions.GlobalActions;
@@ -42,9 +41,6 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor { 
	

	private Logger log = LoggerFactory.getLogger(ApplicationWorkbenchAdvisor.class.getName());

	

	protected static AbstractCoreOperationAdvisor cod =

		CoreOperationExtensionPoint.getCoreOperationAdvisor();



	@Override

	public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(

		final IWorkbenchWindowConfigurer configurer){
@@ -71,7 +67,7 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor { 
	

	@Override

	public String getInitialWindowPerspectiveId(){

		String initPerspective = cod.getInitialPerspective();

		String initPerspective = CoreOperationAdvisorHolder.get().getInitialPerspective();

		

		// avoid that nothing opens up after login in case the stored perspective can't be found

		IPerspectiveRegistry perspectiveRegistry =

bundles/ch.elexis.core.console.application/.classpath

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<classpath>

	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

	<classpathentry kind="src" path="src"/>

	<classpathentry kind="output" path="target/classes"/>

</classpath>

bundles/ch.elexis.core.console.application/.project

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<projectDescription>

	<name>ch.elexis.core.console.application</name>

	<comment></comment>

	<projects>

	</projects>

	<buildSpec>

		<buildCommand>

			<name>org.eclipse.jdt.core.javabuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>org.eclipse.pde.ManifestBuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>org.eclipse.pde.SchemaBuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>org.eclipse.m2e.core.maven2Builder</name>

			<arguments>

			</arguments>

		</buildCommand>

	</buildSpec>

	<natures>

		<nature>org.eclipse.m2e.core.maven2Nature</nature>

		<nature>org.eclipse.pde.PluginNature</nature>

		<nature>org.eclipse.jdt.core.javanature</nature>

	</natures>

</projectDescription>

bundles/ch.elexis.core.console.application/.settings/org.eclipse.jdt.core.prefs

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
eclipse.preferences.version=1

org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

org.eclipse.jdt.core.compiler.compliance=1.7

org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

org.eclipse.jdt.core.compiler.source=1.7