Attachment #134700 for bug #261107

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 417-423 Link Here

(-)contexts.xml (-1 / +2 lines)
417	</context>	417	</context>
418		418
419	<context id="caching_defaultType">	419	<context id="caching_defaultType">
420	<description>Select the default caching strategy for the project. The default is Weak with hard subcache.</description>	420	<description>Select the default caching strategy for the project. The default is Weak with Soft Subcache.</description>
421	<topic label="persistence.xml editor" href="ref_persistence_xml_editor" />	421	<topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
422	<topic label="Managing the persistence.xml file" href="task_manage_persistence" />	422	<topic label="Managing the persistence.xml file" href="task_manage_persistence" />
423	</context>	423	</context>
Lines 611-613 Link Here
611		611
612		612
613	</contexts>	613	</contexts>
		614




/*******************************************************************************
 * Copyright (c) 2007, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.options;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.Options;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaPageComposite;

	}

	// ********** JpaPageComposite implementation **********

	public String getHelpID() {
		return EclipseLinkHelpContextIds.PERSISTENCE_OPTIONS;
	}

	public Image getPageImage() {




/*******************************************************************************
* Copyright (c) 2008, 2009 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.options;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.Options;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;

			EclipseLinkUiMessages.PersistenceXmlOptionsTab_temporalMutableLabel,
			this.buildTemporalMutableHolder(),
			this.buildTemporalMutableStringHolder(),
			EclipseLinkHelpContextIds.PERSISTENCE_OPTIONS
//			EclipseLinkHelpContextIds.OPTIONS_
		);
	}
}




/*******************************************************************************
 * Copyright (c) 2008, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.options;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.Options;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;

			EclipseLinkUiMessages.PersistenceXmlOptionsTab_includeDescriptorQueriesLabel,
			this.buildIncludeDescriptorQueriesHolder(),
			this.buildIncludeDescriptorQueriesStringHolder(),
			EclipseLinkHelpContextIds.PERSISTENCE_OPTIONS
//			EclipseLinkHelpContextIds.
		);
	}
}

Lines 12-17 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java (-1 / +2 lines)
12	import org.eclipse.jpt.core.context.persistence.PersistenceUnit;	12	import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;	13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.general.GeneralProperties;	14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.general.GeneralProperties;
		15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	16	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
16	import org.eclipse.jpt.ui.internal.persistence.details.PersistenceUnitMappingFilesComposite;	17	import org.eclipse.jpt.ui.internal.persistence.details.PersistenceUnitMappingFilesComposite;
17	import org.eclipse.jpt.ui.internal.widgets.Pane;	18	import org.eclipse.jpt.ui.internal.widgets.Pane;
Lines 62-68 Link Here
62	EclipseLinkUiMessages.PersistenceXmlGeneralTab_excludeEclipselinkOrm,	63	EclipseLinkUiMessages.PersistenceXmlGeneralTab_excludeEclipselinkOrm,
63	this.buildExcludeEclipselinkOrmHolder(),	64	this.buildExcludeEclipselinkOrmHolder(),
64	this.buildExcludeEclipselinkOrmStringHolder(),	65	this.buildExcludeEclipselinkOrmStringHolder(),
65	null	66	EclipseLinkHelpContextIds.PERSISTENCE_GENERAL
66	);	67	);
67		68
68	}	69	}

Lines 10-15 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralComposite.java (+8 lines)
10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.general;	10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.general;
11		11
12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;	12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
		13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
13	import org.eclipse.jpt.ui.WidgetFactory;	14	import org.eclipse.jpt.ui.WidgetFactory;
14	import org.eclipse.jpt.ui.internal.persistence.JptUiPersistenceMessages;	15	import org.eclipse.jpt.ui.internal.persistence.JptUiPersistenceMessages;
15	import org.eclipse.jpt.ui.internal.persistence.details.PersistenceUnitGeneralComposite;	16	import org.eclipse.jpt.ui.internal.persistence.details.PersistenceUnitGeneralComposite;
Lines 52-55 Link Here
52		53
53	new EclipseLinkPersistenceUnitMappingFilesComposite(this, container);	54	new EclipseLinkPersistenceUnitMappingFilesComposite(this, container);
54	}	55	}
		56
		57	// ******** JpaPageComposite implementation ********
		58
		59	@Override
		60	public String getHelpID() {
		61	return EclipseLinkHelpContextIds.PERSISTENCE_GENERAL;
		62	}
55	}	63	}

Lines 12-17 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/DefaultCacheTypeComposite.java (-1 / +2 lines)
12	import java.util.Collection;	12	import java.util.Collection;
13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.CacheType;	13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.CacheType;
14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;	14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
		15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	16	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
16	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;	17	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
17	import org.eclipse.jpt.ui.internal.widgets.FormPane;	18	import org.eclipse.jpt.ui.internal.widgets.FormPane;
Lines 84-90 Link Here
84	container,	85	container,
85	EclipseLinkUiMessages.PersistenceXmlCachingTab_defaultCacheTypeLabel,	86	EclipseLinkUiMessages.PersistenceXmlCachingTab_defaultCacheTypeLabel,
86	this.buildDefaultCacheTypeCombo( container),	87	this.buildDefaultCacheTypeCombo( container),
87	null // TODO IJpaHelpContextIds.	88	EclipseLinkHelpContextIds.PERSISTENCE_CACHING_DEFAULT_TYPE
88	);	89	);
89	}	90	}
90	}	91	}

Lines 10-15 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/CacheSizeComposite.java (-1 / +2 lines)
10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.caching;	10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.caching;
11		11
12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;	12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
		13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	14	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
14	import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;	15	import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;
15	import org.eclipse.jpt.ui.internal.widgets.Pane;	16	import org.eclipse.jpt.ui.internal.widgets.Pane;
Lines 53-59 Link Here
53		54
54	@Override	55	@Override
55	protected String getHelpId() {	56	protected String getHelpId() {
56	return null;	57	return EclipseLinkHelpContextIds.PERSISTENCE_CACHING;
57	}	58	}
58		59
59	@Override	60	@Override

Lines 27-32 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/EntityListComposite.java (-1 / +2 lines)
27	import org.eclipse.jpt.core.context.Entity;	27	import org.eclipse.jpt.core.context.Entity;
28	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;	28	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
29	import org.eclipse.jpt.eclipselink.ui.JptEclipseLinkUiPlugin;	29	import org.eclipse.jpt.eclipselink.ui.JptEclipseLinkUiPlugin;
		30	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
30	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	31	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
31	import org.eclipse.jpt.ui.internal.util.PaneEnabler;	32	import org.eclipse.jpt.ui.internal.util.PaneEnabler;
32	import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;	33	import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
Lines 71-77 Link Here
71	this.buildEntityCachingListHolder(),	72	this.buildEntityCachingListHolder(),
72	entityHolder,	73	entityHolder,
73	this.buildEntityLabelProvider(),	74	this.buildEntityLabelProvider(),
74	null // EclipseLinkHelpContextIds.CACHING_ENTITIES	75	EclipseLinkHelpContextIds.PERSISTENCE_CACHING
75	);	76	);
76		77
77	// Entity Caching property pane	78	// Entity Caching property pane

Lines 10-15 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/DefaultCacheSizeComposite.java (-1 / +2 lines)
10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.caching;	10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.caching;
11		11
12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;	12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
		13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	14	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
14	import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;	15	import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;
15	import org.eclipse.jpt.ui.internal.widgets.Pane;	16	import org.eclipse.jpt.ui.internal.widgets.Pane;
Lines 54-60 Link Here
54		55
55	@Override	56	@Override
56	protected String getHelpId() {	57	protected String getHelpId() {
57	return null;	58	return EclipseLinkHelpContextIds.PERSISTENCE_CACHING_DEFAULT_SIZE;
58	}	59	}
59		60
60	@Override	61	@Override




/*******************************************************************************
* Copyright (c) 2007, 2009 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.caching;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaPageComposite;

	}

	// ********** JpaPageComposite implementation **********

	public String getHelpID() {
		return EclipseLinkHelpContextIds.PERSISTENCE_CACHING;
	}

	public Image getPageImage() {

Lines 10-15 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/DefaultSharedCacheComposite.java (-2 / +2 lines)
10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.caching;	10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.caching;
11		11
12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;	12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
		13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	14	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
14	import org.eclipse.jpt.ui.internal.widgets.FormPane;	15	import org.eclipse.jpt.ui.internal.widgets.FormPane;
15	import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;	16	import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
Lines 89-96 Link Here
89	EclipseLinkUiMessages.PersistenceXmlCachingTab_sharedCacheDefaultLabel,	90	EclipseLinkUiMessages.PersistenceXmlCachingTab_sharedCacheDefaultLabel,
90	this.buildDefaultSharedCacheHolder(),	91	this.buildDefaultSharedCacheHolder(),
91	this.buildDefaultSharedCacheStringHolder(),	92	this.buildDefaultSharedCacheStringHolder(),
92	null	93	EclipseLinkHelpContextIds.PERSISTENCE_CACHING_DEFAULT_SHARED
93	// EclipseLinkHelpContextIds.CACHING_SHARED_CACHE_DEFAULT
94	);	94	);
95	}	95	}
96	}	96	}

Lines 13-18 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/FlushClearCacheComposite.java (-1 / +2 lines)
13		13
14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;	14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
15	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.FlushClearCache;	15	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.FlushClearCache;
		16	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
16	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	17	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
17	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;	18	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
18	import org.eclipse.jpt.ui.internal.widgets.FormPane;	19	import org.eclipse.jpt.ui.internal.widgets.FormPane;
Lines 84-90 Link Here
84	container,	85	container,
85	EclipseLinkUiMessages.PersistenceXmlCachingTab_FlushClearCacheLabel,	86	EclipseLinkUiMessages.PersistenceXmlCachingTab_FlushClearCacheLabel,
86	this.addFlushClearCacheCombo(container),	87	this.addFlushClearCacheCombo(container),
87	null // TODO IJpaHelpContextIds.	88	EclipseLinkHelpContextIds.PERSISTENCE_CACHING
88	);	89	);
89	}	90	}
90	}	91	}

Lines 12-17 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/CacheTypeComposite.java (-1 / +2 lines)
12	import java.util.Collection;	12	import java.util.Collection;
13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.CacheType;	13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.CacheType;
14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;	14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
		15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	16	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
16	import org.eclipse.jpt.ui.internal.listeners.SWTPropertyChangeListenerWrapper;	17	import org.eclipse.jpt.ui.internal.listeners.SWTPropertyChangeListenerWrapper;
17	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;	18	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
Lines 49-55 Link Here
49	container,	50	container,
50	EclipseLinkUiMessages.PersistenceXmlCachingTab_cacheTypeLabel,	51	EclipseLinkUiMessages.PersistenceXmlCachingTab_cacheTypeLabel,
51	new CacheTypeCombo(container),	52	new CacheTypeCombo(container),
52	null // TODO IJpaHelpContextIds.	53	EclipseLinkHelpContextIds.PERSISTENCE_CACHING
53	);	54	);
54	}	55	}
55		56

Lines 11-16 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/SharedCacheComposite.java (-2 / +2 lines)
11		11
12	import java.util.ArrayList;	12	import java.util.ArrayList;
13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;	13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
		14	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
14	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
15	import org.eclipse.jpt.ui.internal.widgets.Pane;	16	import org.eclipse.jpt.ui.internal.widgets.Pane;
16	import org.eclipse.jpt.ui.internal.widgets.TriStateCheckBox;	17	import org.eclipse.jpt.ui.internal.widgets.TriStateCheckBox;
Lines 147-154 Link Here
147	EclipseLinkUiMessages.PersistenceXmlCachingTab_sharedCacheLabel,	148	EclipseLinkUiMessages.PersistenceXmlCachingTab_sharedCacheLabel,
148	this.buildSharedCacheHolder(),	149	this.buildSharedCacheHolder(),
149	this.buildSharedCacheStringHolder(),	150	this.buildSharedCacheStringHolder(),
150	null	151	EclipseLinkHelpContextIds.PERSISTENCE_CACHING
151	// EclipseLinkHelpContextIds.CACHING_SHARED_CACHE
152	);	152	);
153	}	153	}
154	}	154	}

Lines 1-5 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/LoggingLevelComposite.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008 Oracle. All rights reserved.	2	* Copyright (c) 2008, 2009 Oracle. All rights reserved.
3	* This program and the accompanying materials are made available under the	3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0, which accompanies this distribution	4	* terms of the Eclipse Public License v1.0, which accompanies this distribution
5	* and is available at http://www.eclipse.org/legal/epl-v10.html.	5	* and is available at http://www.eclipse.org/legal/epl-v10.html.
Lines 12-17 Link Here
12	import java.util.Collection;	12	import java.util.Collection;
13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;	13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;
14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.LoggingLevel;	14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.LoggingLevel;
		15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	16	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
16	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;	17	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
17	import org.eclipse.jpt.ui.internal.widgets.FormPane;	18	import org.eclipse.jpt.ui.internal.widgets.FormPane;
Lines 83-89 Link Here
83	container,	84	container,
84	EclipseLinkUiMessages.PersistenceXmlLoggingTab_loggingLevelLabel,	85	EclipseLinkUiMessages.PersistenceXmlLoggingTab_loggingLevelLabel,
85	this.addLoggingLevelCombo(container),	86	this.addLoggingLevelCombo(container),
86	null // TODO IJpaHelpContextIds.	87	EclipseLinkHelpContextIds.PERSISTENCE_LOGGING_LEVEL
87	);	88	);
88	}	89	}
89	}	90	}




/*******************************************************************************
 * Copyright (c) 2008, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.logging;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;

			EclipseLinkUiMessages.PersistenceXmlLoggingTab_exceptionsLabel,
			this.buildExceptionsHolder(),
			this.buildExceptionsStringHolder(),
			EclipseLinkHelpContextIds.PERSISTENCE_LOGGING_EXCEPTIONS
//			EclipseLinkHelpContextIds.LOGGING_
		);
	}
}




/*******************************************************************************
 * Copyright (c) 2007, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.logging;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaPageComposite;

	}

	// ********** JpaPageComposite implementation **********

	public String getHelpID() {
		return EclipseLinkHelpContextIds.PERSISTENCE_LOGGING;
	}

	public Image getPageImage() {




/*******************************************************************************
 * Copyright (c) 2008, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.logging;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;

			EclipseLinkUiMessages.PersistenceXmlLoggingTab_sessionLabel,
			this.buildSessionHolder(),
			this.buildSessionStringHolder(),
			EclipseLinkHelpContextIds.PERSISTENCE_LOGGING_SESSION
//			EclipseLinkHelpContextIds.LOGGING_
		);
	}
}




/*******************************************************************************
 * Copyright (c) 2008, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.logging;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;

			EclipseLinkUiMessages.PersistenceXmlLoggingTab_threadLabel,
			this.buildThreadHolder(),
			this.buildThreadStringHolder(),
			EclipseLinkHelpContextIds.PERSISTENCE_LOGGING_THREAD
//			EclipseLinkHelpContextIds.LOGGING_
		);
	}
}




/*******************************************************************************
 * Copyright (c) 2008, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.logging;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;

			EclipseLinkUiMessages.PersistenceXmlLoggingTab_timestampLabel,
			this.buildTimestampHolder(),
			this.buildTimestampStringHolder(),
			EclipseLinkHelpContextIds.PERSISTENCE_LOGGING_TIMESTAMP
//			EclipseLinkHelpContextIds.LOGGING_
		);
	}
}

Lines 1-5 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcWriteConnectionsMinComposite.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008 Oracle. All rights reserved.	2	* Copyright (c) 2008, 2008 Oracle. All rights reserved.
3	* This program and the accompanying materials are made available under the	3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0, which accompanies this distribution	4	* terms of the Eclipse Public License v1.0, which accompanies this distribution
5	* and is available at http://www.eclipse.org/legal/epl-v10.html.	5	* and is available at http://www.eclipse.org/legal/epl-v10.html.
Lines 10-15 Link Here
10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;	10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;
11		11
12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;	12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
		13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	14	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
14	import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;	15	import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;
15	import org.eclipse.jpt.ui.internal.widgets.Pane;	16	import org.eclipse.jpt.ui.internal.widgets.Pane;
Lines 52-58 Link Here
52		53
53	@Override	54	@Override
54	protected String getHelpId() {	55	protected String getHelpId() {
55	return null;	56	return EclipseLinkHelpContextIds.PERSISTENCE_CONNECTION;
56	}	57	}
57		58
58	@Override	59	@Override

Lines 1-5 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcReadConnectionsMaxComposite.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008 Oracle. All rights reserved.	2	* Copyright (c) 2008, 2009 Oracle. All rights reserved.
3	* This program and the accompanying materials are made available under the	3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0, which accompanies this distribution	4	* terms of the Eclipse Public License v1.0, which accompanies this distribution
5	* and is available at http://www.eclipse.org/legal/epl-v10.html.	5	* and is available at http://www.eclipse.org/legal/epl-v10.html.
Lines 10-15 Link Here
10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;	10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;
11		11
12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;	12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
		13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	14	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
14	import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;	15	import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;
15	import org.eclipse.jpt.ui.internal.widgets.Pane;	16	import org.eclipse.jpt.ui.internal.widgets.Pane;
Lines 53-59 Link Here
53		54
54	@Override	55	@Override
55	protected String getHelpId() {	56	protected String getHelpId() {
56	return null;	57	return EclipseLinkHelpContextIds.PERSISTENCE_CONNECTION;
57	}	58	}
58		59
59	@Override	60	@Override

Lines 1-5 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcReadConnectionsMinComposite.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008 Oracle. All rights reserved.	2	* Copyright (c) 2008, 2009 Oracle. All rights reserved.
3	* This program and the accompanying materials are made available under the	3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0, which accompanies this distribution	4	* terms of the Eclipse Public License v1.0, which accompanies this distribution
5	* and is available at http://www.eclipse.org/legal/epl-v10.html.	5	* and is available at http://www.eclipse.org/legal/epl-v10.html.
Lines 10-15 Link Here
10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;	10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;
11		11
12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;	12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
		13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	14	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
14	import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;	15	import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;
15	import org.eclipse.jpt.ui.internal.widgets.Pane;	16	import org.eclipse.jpt.ui.internal.widgets.Pane;
Lines 52-58 Link Here
52		53
53	@Override	54	@Override
54	protected String getHelpId() {	55	protected String getHelpId() {
55	return null;	56	return EclipseLinkHelpContextIds.PERSISTENCE_CONNECTION;
56	}	57	}
57		58
58	@Override	59	@Override




/*******************************************************************************
 * Copyright (c) 2008, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;

			EclipseLinkUiMessages.PersistenceXmlConnectionTab_nativeSqlLabel,
			this.buildNativeSqlHolder(),
			this.buildNativeSqlStringHolder(),
			EclipseLinkHelpContextIds.PERSISTENCE_CONNECTION
//			EclipseLinkHelpContextIds.
		);
	}
}




/*******************************************************************************
 * Copyright (c) 2007, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaPageComposite;

	}

	// ********** JpaPageComposite implementation **********

	public String getHelpID() {
		return EclipseLinkHelpContextIds.PERSISTENCE_CONNECTION;
	}

	public Image getPageImage() {

Lines 10-15 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcReadConnectionsSharedComposite.java (-2 / +2 lines)
10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;	10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;
11		11
12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;	12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
		13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	14	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
14	import org.eclipse.jpt.ui.internal.widgets.Pane;	15	import org.eclipse.jpt.ui.internal.widgets.Pane;
15	import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;	16	import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
Lines 89-96 Link Here
89	EclipseLinkUiMessages.PersistenceXmlConnectionTab_readConnectionsSharedLabel,	90	EclipseLinkUiMessages.PersistenceXmlConnectionTab_readConnectionsSharedLabel,
90	this.buildReadConnectionsSharedHolder(),	91	this.buildReadConnectionsSharedHolder(),
91	this.buildReadConnectionsSharedStringHolder(),	92	this.buildReadConnectionsSharedStringHolder(),
92	null	93	EclipseLinkHelpContextIds.PERSISTENCE_CONNECTION
93	// EclipseLinkHelpContextIds.
94	);	94	);
95	}	95	}
96	}	96	}

Lines 1-5 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcWriteConnectionsMaxComposite.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008 Oracle. All rights reserved.	2	* Copyright (c) 2008, 2009 Oracle. All rights reserved.
3	* This program and the accompanying materials are made available under the	3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0, which accompanies this distribution	4	* terms of the Eclipse Public License v1.0, which accompanies this distribution
5	* and is available at http://www.eclipse.org/legal/epl-v10.html.	5	* and is available at http://www.eclipse.org/legal/epl-v10.html.
Lines 10-15 Link Here
10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;	10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;
11		11
12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;	12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
		13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	14	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
14	import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;	15	import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;
15	import org.eclipse.jpt.ui.internal.widgets.Pane;	16	import org.eclipse.jpt.ui.internal.widgets.Pane;
Lines 52-58 Link Here
52		53
53	@Override	54	@Override
54	protected String getHelpId() {	55	protected String getHelpId() {
55	return null;	56	return EclipseLinkHelpContextIds.PERSISTENCE_CONNECTION;
56	}	57	}
57		58
58	@Override	59	@Override




package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.PaneEnabler;
import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;

			container,
			EclipseLinkUiMessages.PersistenceXmlConnectionTab_cacheStatementsLabel,
			cacheStatementsHolder,
			EclipseLinkHelpContextIds.PERSISTENCE_CONNECTION
		);
		IntegerCombo<?> combo = addCacheStatementsSizeCombo(container);


		
			@Override
			protected String getHelpId() {
				return EclipseLinkHelpContextIds.PERSISTENCE_CONNECTION;
			}

			@Override

Lines 14-19 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/TransactionTypeComposite.java (-1 / +2 lines)
14	import org.eclipse.jpt.core.context.persistence.PersistenceUnit;	14	import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
15	import org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType;	15	import org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType;
16	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;	16	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
		17	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
17	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	18	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
18	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;	19	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
19	import org.eclipse.jpt.ui.internal.widgets.FormPane;	20	import org.eclipse.jpt.ui.internal.widgets.FormPane;
Lines 119-125 Link Here
119	container,	120	container,
120	EclipseLinkUiMessages.PersistenceXmlConnectionTab_transactionTypeLabel,	121	EclipseLinkUiMessages.PersistenceXmlConnectionTab_transactionTypeLabel,
121	this.addTransactionTypeCombo( container),	122	this.addTransactionTypeCombo( container),
122	null // TODO IJpaHelpContextIds.	123	EclipseLinkHelpContextIds.PERSISTENCE_CONNECTION
123	);	124	);
124	}	125	}
125	}	126	}




/*******************************************************************************
 * Copyright (c) 2008, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;

			EclipseLinkUiMessages.PersistenceXmlConnectionTab_bindParametersLabel,
			this.buildBindParametersHolder(),
			this.buildBindParametersStringHolder(),
			EclipseLinkHelpContextIds.PERSISTENCE_CONNECTION
//			EclipseLinkHelpContextIds.
		);
	}
}




import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
import org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType;
import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.ControlEnabler;
import org.eclipse.jpt.ui.internal.widgets.Pane;


		// JTA Data Source
		Label jtaLabel = addUnmanagedLabel(container, EclipseLinkUiMessages.PersistenceXmlConnectionTab_jtaDataSourceLabel);
		Text text = addUnmanagedText(container, this.buildJtaDataSourceHolder(), this.getHelpID());
		this.addLabeledComposite(container, jtaLabel, text, this.getHelpID());

		this.installJTADataSourceControlEnabler(text, jtaLabel);

		// Non-JTA Data Source
		Label nonJtaLabel = addUnmanagedLabel(container, EclipseLinkUiMessages.PersistenceXmlConnectionTab_nonJtaDataSourceLabel);
		Text nonJtaText = addUnmanagedText(container, buildNonJtaDataSourceHolder(), this.getHelpID());
		this.addLabeledComposite(container, nonJtaLabel, nonJtaText, this.getHelpID());

		this.installNonJTADataSourceControlEnabler(nonJtaText, nonJtaLabel);
	}

	private void installNonJTADataSourceControlEnabler(Text text, Label label) {
		new ControlEnabler(buildNonJTADataSourceHolder(), text, label);
	}
	
	public String getHelpID() {
		return EclipseLinkHelpContextIds.PERSISTENCE_CONNECTION;
	}
}

Lines 1-5 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/BatchWritingComposite.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008 Oracle. All rights reserved.	2	* Copyright (c) 2008, 2009 Oracle. All rights reserved.
3	* This program and the accompanying materials are made available under the	3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0, which accompanies this distribution	4	* terms of the Eclipse Public License v1.0, which accompanies this distribution
5	* and is available at http://www.eclipse.org/legal/epl-v10.html.	5	* and is available at http://www.eclipse.org/legal/epl-v10.html.
Lines 12-17 Link Here
12	import java.util.Collection;	12	import java.util.Collection;
13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.BatchWriting;	13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.BatchWriting;
14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;	14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
		15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	16	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
16	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;	17	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
17	import org.eclipse.jpt.ui.internal.widgets.FormPane;	18	import org.eclipse.jpt.ui.internal.widgets.FormPane;
Lines 79-85 Link Here
79	container,	80	container,
80	EclipseLinkUiMessages.PersistenceXmlConnectionTab_batchWritingLabel,	81	EclipseLinkUiMessages.PersistenceXmlConnectionTab_batchWritingLabel,
81	this.addBatchWritingCombo( container),	82	this.addBatchWritingCombo( container),
82	null // TODO IJpaHelpContextIds.	83	EclipseLinkHelpContextIds.PERSISTENCE_CONNECTION
83	);	84	);
84	}	85	}
85	}	86	}

Lines 12-17 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/DdlGenerationTypeComposite.java (-1 / +2 lines)
12	import java.util.Collection;	12	import java.util.Collection;
13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.DdlGenerationType;	13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.DdlGenerationType;
14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.SchemaGeneration;	14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.SchemaGeneration;
		15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	16	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
16	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;	17	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
17	import org.eclipse.jpt.ui.internal.widgets.FormPane;	18	import org.eclipse.jpt.ui.internal.widgets.FormPane;
Lines 80-86 Link Here
80	container,	81	container,
81	EclipseLinkUiMessages.PersistenceXmlSchemaGenerationTab_ddlGenerationTypeLabel,	82	EclipseLinkUiMessages.PersistenceXmlSchemaGenerationTab_ddlGenerationTypeLabel,
82	addDdlGenerationTypeCombo( container),	83	addDdlGenerationTypeCombo( container),
83	null // TODO IJpaHelpContextIds.	84	EclipseLinkHelpContextIds.PERSISTENCE_SCHEMA_GENERATION
84	);	85	);
85	}	86	}
86	}	87	}

Lines 1-5 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/OutputModeComposite.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008 Oracle. All rights reserved.	2	* Copyright (c) 2008, 2009 Oracle. All rights reserved.
3	* This program and the accompanying materials are made available under the	3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0, which accompanies this distribution	4	* terms of the Eclipse Public License v1.0, which accompanies this distribution
5	* and is available at http://www.eclipse.org/legal/epl-v10.html.	5	* and is available at http://www.eclipse.org/legal/epl-v10.html.
Lines 12-17 Link Here
12	import java.util.Collection;	12	import java.util.Collection;
13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.OutputMode;	13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.OutputMode;
14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.SchemaGeneration;	14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.SchemaGeneration;
		15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	16	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
16	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;	17	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
17	import org.eclipse.jpt.ui.internal.widgets.FormPane;	18	import org.eclipse.jpt.ui.internal.widgets.FormPane;
Lines 78-84 Link Here
78	container,	79	container,
79	EclipseLinkUiMessages.PersistenceXmlSchemaGenerationTab_outputModeLabel,	80	EclipseLinkUiMessages.PersistenceXmlSchemaGenerationTab_outputModeLabel,
80	this.addBuildOutputModeCombo(container),	81	this.addBuildOutputModeCombo(container),
81	null // TODO IJpaHelpContextIds.	82	EclipseLinkHelpContextIds.PERSISTENCE_SCHEMA_GENERATION
82	);	83	);
83	}	84	}
84	}	85	}




/*******************************************************************************
 * Copyright (c) 2007, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.schema.generation;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.SchemaGeneration;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaPageComposite;

	}

	// ********** JpaPageComposite implementation **********

	public String getHelpID() {
		return EclipseLinkHelpContextIds.PERSISTENCE_SCHEMA_GENERATION;
	}

	public Image getPageImage() {




/*******************************************************************************
 * Copyright (c) 2008, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;

			EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingFetchGroupsLabel,
			this.buildWeavingFetchGroupsHolder(),
			this.buildWeavingFetchGroupsStringHolder(),
			EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
//			EclipseLinkHelpContextIds.CUSTOMIZATION_WEAVING_FETCH_GROUPS
		);
	}
}




/*******************************************************************************
 * Copyright (c) 2008, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;

			EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingLazyLabel,
			this.buildWeavingLazyHolder(),
			this.buildWeavingLazyStringHolder(),
			EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
//			EclipseLinkHelpContextIds.CUSTOMIZATION_WEAVING_LAZY
		);
	}
}




/*******************************************************************************
 * Copyright (c) 2008, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;

			EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingEagerLabel,
			this.buildWeavingEagerHolder(),
			this.buildWeavingEagerStringHolder(),
			EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
//			EclipseLinkHelpContextIds._
		);
	}
}




/*******************************************************************************
* Copyright (c) 2009 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaPageComposite;

	}

	// ********** JpaPageComposite implementation **********

	public String getHelpID() {
		return EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION;
	}

	public Image getPageImage() {

Lines 10-15 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/ValidationOnlyComposite.java (-2 / +2 lines)
10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;	10	package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;
11		11
12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;	12	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
		13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
13	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	14	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
14	import org.eclipse.jpt.ui.internal.widgets.FormPane;	15	import org.eclipse.jpt.ui.internal.widgets.FormPane;
15	import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;	16	import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
Lines 89-96 Link Here
89	EclipseLinkUiMessages.PersistenceXmlCustomizationTab_validationOnlyLabel,	90	EclipseLinkUiMessages.PersistenceXmlCustomizationTab_validationOnlyLabel,
90	this.buildValidationOnlyHolder(),	91	this.buildValidationOnlyHolder(),
91	this.buildValidationOnlyStringHolder(),	92	this.buildValidationOnlyStringHolder(),
92	null	93	EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
93	// EclipseLinkHelpContextIds.
94	);	94	);
95	}	95	}
96	}	96	}

Lines 27-32 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/EntityListComposite.java (-1 / +2 lines)
27	import org.eclipse.jpt.core.context.Entity;	27	import org.eclipse.jpt.core.context.Entity;
28	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;	28	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
29	import org.eclipse.jpt.eclipselink.ui.JptEclipseLinkUiPlugin;	29	import org.eclipse.jpt.eclipselink.ui.JptEclipseLinkUiPlugin;
		30	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
30	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	31	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
31	import org.eclipse.jpt.ui.internal.util.PaneEnabler;	32	import org.eclipse.jpt.ui.internal.util.PaneEnabler;
32	import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;	33	import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
Lines 79-85 Link Here
79	this.buildEntityCustomizationListHolder(),	80	this.buildEntityCustomizationListHolder(),
80	this.entityHolder,	81	this.entityHolder,
81	this.buildEntityLabelProvider(),	82	this.buildEntityLabelProvider(),
82	null // EclipseLinkHelpContextIds.CUSTOMIZATION_ENTITIES	83	EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
83	);	84	);
84		85
85	// Entity Customization property pane	86	// Entity Customization property pane




/*******************************************************************************
 * Copyright (c) 2008, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;

			EclipseLinkUiMessages.PersistenceXmlCustomizationTab_throwExceptionsLabel,
			this.buildThrowExceptionsHolder(),
			this.buildThrowExceptionsStringHolder(),
			EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
//			EclipseLinkHelpContextIds.CUSTOMIZATION_THROW_EXCEPTIONS
		);
	}
	

Lines 1-5 Link Here

(-)src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingComposite.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008 Oracle. All rights reserved.	2	* Copyright (c) 2008, 2009 Oracle. All rights reserved.
3	* This program and the accompanying materials are made available under the	3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0, which accompanies this distribution	4	* terms of the Eclipse Public License v1.0, which accompanies this distribution
5	* and is available at http://www.eclipse.org/legal/epl-v10.html.	5	* and is available at http://www.eclipse.org/legal/epl-v10.html.
Lines 12-17 Link Here
12	import java.util.Collection;	12	import java.util.Collection;
13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;	13	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Weaving;	14	import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Weaving;
		15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
15	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;	16	import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
16	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;	17	import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
17	import org.eclipse.jpt.ui.internal.widgets.FormPane;	18	import org.eclipse.jpt.ui.internal.widgets.FormPane;
Lines 79-85 Link Here
79	container,	80	container,
80	EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingLabel,	81	EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingLabel,
81	this.addWeavingCombo( container),	82	this.addWeavingCombo( container),
82	null // TODO IJpaHelpContextIds.	83	EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
83	);	84	);
84	}	85	}
85		86




/*******************************************************************************
 * Copyright (c) 2008, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;

			EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingChangeTrackingLabel,
			this.buildWeavingChangeTrackingHolder(),
			this.buildWeavingChangeTrackingStringHolder(),
			EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
//			EclipseLinkHelpContextIds.CUSTOMIZATION_WEAVING_CHANGE_TRACKING
		);
	}
}




/*******************************************************************************
 * Copyright (c) 2008, 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.

package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;

import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;

			EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingInternalLabel,
			this.buildWeavingInternalHolder(),
			this.buildWeavingInternalStringHolder(),
			EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
//			EclipseLinkHelpContextIds._WEAVING_INTERNAL
		);
	}
}




/*******************************************************************************
 * Copyright (c) 2009 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0, which accompanies this distribution and is available at
 * http://www.eclipse.org/legal/epl-v10.html.

 ******************************************************************************/
package org.eclipse.jpt.eclipselink.ui.internal;

import org.eclipse.jpt.ui.JptUiPlugin;

/**
 * Help context ids for the Dali EclipseLink UI.

public interface EclipseLinkHelpContextIds {

	//ContextID prefix
	public static final String PREFIX = JptUiPlugin.PLUGIN_ID + ".";

	//Persistent Type composites
	public static final String CACHING_CACHE_TYPE = PREFIX + "caching_cacheType";
	public static final String CACHING_SHARED = PREFIX + "caching_shared";
	public static final String CACHING_ALWAYS_REFRESH = PREFIX + "caching_alwaysRefresh";
	public static final String CACHING_REFRESH_ONLY_IF_NEWER = PREFIX + "caching_refreshOnlyIfNewer";
	public static final String CACHING_DISABLE_HITS = PREFIX + "caching_disableHits";
	public static final String CACHING_CACHE_COORDINATION_TYPE = PREFIX + "caching_cacheCoordinationType";
	public static final String CACHING_CACHE_TYPE = PREFIX + "caching_cacheType";
	public static final String CACHING_DISABLE_HITS = PREFIX + "caching_disableHits";
	public static final String CACHING_REFRESH_ONLY_IF_NEWER = PREFIX + "caching_refreshOnlyIfNewer";
	public static final String CACHING_SHARED = PREFIX + "caching_shared";

	//Persistence Xml Editor
	public static final String PERSISTENCE_CACHING = PREFIX + "persistence_caching";
	public static final String PERSISTENCE_CONNECTION = PREFIX + "persistence_connection";
	public static final String PERSISTENCE_CUSTOMIZATION = PREFIX + "persistence_customization";
	public static final String PERSISTENCE_GENERAL = PREFIX + "persistence_general";
	public static final String PERSISTENCE_LOGGING = PREFIX + "persistence_logging";
	public static final String PERSISTENCE_OPTIONS = PREFIX + "persistence_options";
	public static final String PERSISTENCE_SCHEMA_GENERATION = PREFIX + "persistence_schemaGeneration";

	public static final String PERSISTENCE_CACHING_DEFAULT_SHARED = PREFIX + "caching_defaultShared";
	public static final String PERSISTENCE_CACHING_DEFAULT_SIZE = PREFIX + "caching_defaultSize";
	public static final String PERSISTENCE_CACHING_DEFAULT_TYPE = PREFIX + "caching_defaultType";
	
	public static final String PERSISTENCE_LOGGING_EXCEPTIONS = PREFIX + "logging_exceptions";
	public static final String PERSISTENCE_LOGGING_LEVEL = PREFIX + "logging_level";
	public static final String PERSISTENCE_LOGGING_SESSION = PREFIX + "logging_session";
	public static final String PERSISTENCE_LOGGING_THREAD = PREFIX + "logging_thread";
	public static final String PERSISTENCE_LOGGING_TIMESTAMP = PREFIX + "logging_timeStamp";
	
	public static final String PERSISTENCE_OPTIONS_SESSION_NAME = PREFIX + "options_sessionName";
	public static final String PERSISTENCE_OPTIONS_SESSIONS_XML = PREFIX + "options_sessionsXml";
	public static final String PERSISTENCE_OPTIONS_TARGET_DATABASE = PREFIX + "options_targetDatabase";
	public static final String PERSISTENCE_OPTIONS_TARGET_SERVER = PREFIX + "options_targetServer";

}

Lines 131-137 Link Here

(-)src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitPropertiesComposite.java (-1 / +1 lines)
131	* {@inheritDoc}	131	* {@inheritDoc}
132	*/	132	*/
133	public String getHelpID() {	133	public String getHelpID() {
134	return JpaHelpContextIds.PERSISTENCE_UNIT_PROPERTIES;	134	return JpaHelpContextIds.PERSISTENCE_XML_PROPERTIES;
135	}	135	}
136		136
137	/**	137	/**

Lines 91-97 Link Here

(-)src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionComposite.java (-1 / +1 lines)
91	* (non-Javadoc)	91	* (non-Javadoc)
92	*/	92	*/
93	public String getHelpID() {	93	public String getHelpID() {
94	return JpaHelpContextIds.PERSISTENCE_UNIT_CONNECTION;	94	return JpaHelpContextIds.PERSISTENCE_XML_CONNECTION;
95	}	95	}
96		96
97	private void initializeDatabasePane(Composite container) {	97	private void initializeDatabasePane(Composite container) {

Lines 170-176 Link Here

(-)src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitGeneralComposite.java (-1 / +1 lines)
170	* (non-Javadoc)	170	* (non-Javadoc)
171	*/	171	*/
172	public String getHelpID() {	172	public String getHelpID() {
173	return JpaHelpContextIds.PERSISTENCE_UNIT_GENERAL;	173	return JpaHelpContextIds.PERSISTENCE_XML_GENERAL;
174	}	174	}
175		175
176	/*	176	/*

Lines 34-39 Link Here

(-)src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java (+6 lines)
34	import org.eclipse.swt.widgets.Label;	34	import org.eclipse.swt.widgets.Label;
35	import org.eclipse.swt.widgets.Link;	35	import org.eclipse.swt.widgets.Link;
36	import org.eclipse.ui.PlatformUI;	36	import org.eclipse.ui.PlatformUI;
		37	import org.eclipse.ui.help.IWorkbenchHelpSystem;
37	import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;	38	import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
38	import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;	39	import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
39	import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;	40	import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
Lines 56-61 Link Here
56	Composite composite = new Composite(parent, SWT.NULL);	57	Composite composite = new Composite(parent, SWT.NULL);
57	GridLayout layout = new GridLayout();	58	GridLayout layout = new GridLayout();
58	composite.setLayout(layout);	59	composite.setLayout(layout);
		60	this.getHelpSystem().setHelp(composite, JpaHelpContextIds.NEW_JPA_PROJECT_JPA_FACET);
59		61
60	new PlatformGroup(composite);	62	new PlatformGroup(composite);
61	new ClasspathConfigGroup(composite);	63	new ClasspathConfigGroup(composite);
Lines 370-373 Link Here
370	synchHelper.synchCheckbox(createOrmXmlButton, CREATE_ORM_XML, null);	372	synchHelper.synchCheckbox(createOrmXmlButton, CREATE_ORM_XML, null);
371	}	373	}
372	}	374	}
		375
		376	protected final IWorkbenchHelpSystem getHelpSystem() {
		377	return PlatformUI.getWorkbench().getHelpSystem();
		378	}
373	}	379	}




import org.eclipse.jpt.gen.internal2.ORMGenTable;
import org.eclipse.jpt.gen.internal2.util.DTPUtil;
import org.eclipse.jpt.ui.CommonImages;
import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StackLayout;
import org.eclipse.swt.graphics.Image;

import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.help.IWorkbenchHelpSystem;

public class TablesAndColumnsCustomizationWizardPage extends NewTypeWizardPage {


		GridLayout layout = new GridLayout();
		layout.numColumns = nColumns;
		composite.setLayout(layout);
		this.getHelpSystem().setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_CUSTOMIZE_INDIVIDUAL_ENTITIES);

		createTableAndColumnsListPanel(composite, 1);
		

    @Override
    public final void performHelp() 
    {
        this.getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
    }

	protected final IWorkbenchHelpSystem getHelpSystem() {
		return PlatformUI.getWorkbench().getHelpSystem();
	}
}




import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.help.IWorkbenchHelpSystem;

class TablesSelectorWizardPage extends WizardPage{


		GridLayout layout = new GridLayout();
		layout.numColumns = nColumns;
		composite.setLayout(layout);
		this.getHelpSystem().setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_SELECT_TABLES);

		this.databaseGroup = createDatabaseGroup(composite, 400);


		restoreBtn.setLayoutData(gridData);
		
		
		this.getHelpSystem().setHelp(this.tableTable.getControl(), JpaHelpContextIds.DIALOG_GENERATE_ENTITIES_TABLES);

		this.setControl(composite);

		this.setPageComplete(true);
	}

	@Override

    @Override
    public final void performHelp() 
    {
    	this.getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
    }
    
	protected final IWorkbenchHelpSystem getHelpSystem() {
		return PlatformUI.getWorkbench().getHelpSystem();
	}
}




import org.eclipse.jpt.gen.internal2.ORMGenCustomizer;
import org.eclipse.jpt.gen.internal2.ORMGenTable;
import org.eclipse.jpt.ui.JptUiPlugin;
import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;

import org.eclipse.swt.widgets.Group;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
import org.eclipse.ui.help.IWorkbenchHelpSystem;

/**
 * A wizard page allowing the entry of the default table generation 

		GridLayout layout = new GridLayout();
		layout.numColumns = nColumns;
		composite.setLayout(layout);
		this.getHelpSystem().setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_CUSTOMIZE_DEFAULT_ENTITY_GENERATION);

		//Create entity access, collection type, etc 
		defaultTableGenPanel = new TableGenPanel(composite, 4, true, this);


    @Override
    public final void performHelp() {
        this.getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
    }
    
	protected final IWorkbenchHelpSystem getHelpSystem() {
		return PlatformUI.getWorkbench().getHelpSystem();
	}
}


Lines 12-17 Link Here

(-)src/org/eclipse/jpt/ui/internal/wizards/gen/CardinalityPage.java (-1 / +2 lines)
12		12
13	import org.eclipse.jpt.gen.internal2.Association;	13	import org.eclipse.jpt.gen.internal2.Association;
14	import org.eclipse.jpt.gen.internal2.ORMGenCustomizer;	14	import org.eclipse.jpt.gen.internal2.ORMGenCustomizer;
		15	import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
15	import org.eclipse.swt.SWT;	16	import org.eclipse.swt.SWT;
16	import org.eclipse.swt.events.SelectionEvent;	17	import org.eclipse.swt.events.SelectionEvent;
17	import org.eclipse.swt.events.SelectionListener;	18	import org.eclipse.swt.events.SelectionListener;
Lines 45-51 Link Here
45	GridLayout layout = new GridLayout();	46	GridLayout layout = new GridLayout();
46	layout.numColumns = nColumns;	47	layout.numColumns = nColumns;
47	composite.setLayout(layout);	48	composite.setLayout(layout);
48	//PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, JpaHelpContextIds.DIALOG_GENERATE_ENTITIES);	49	this.getHelpSystem().setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_ASSOCIATION_CARDINALITY);
49		50
50	CardinalitySelectionListener selectionListener = new CardinalitySelectionListener();	51	CardinalitySelectionListener selectionListener = new CardinalitySelectionListener();
51	cardinalityButtons[0] = createRadioButton( composite, 1, JptUiEntityGenMessages.manyToOne);	52	cardinalityButtons[0] = createRadioButton( composite, 1, JptUiEntityGenMessages.manyToOne);




import org.eclipse.jpt.gen.internal2.ORMGenCustomizer;
import org.eclipse.jpt.gen.internal2.util.DTPUtil;
import org.eclipse.jpt.ui.CommonImages;
import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StackLayout;
import org.eclipse.swt.events.ModifyEvent;

import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.help.IWorkbenchHelpSystem;

public class TableAssociationsWizardPage extends WizardPage {


		GridLayout layout = new GridLayout();
		layout.numColumns = nColumns;
		composite.setLayout(layout);
		this.getHelpSystem().setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_TABLE_ASSOCIATIONS);

		Label label = new Label(composite, SWT.NONE);
		label.setText( JptUiEntityGenMessages.GenerateEntitiesWizard_assocPage_label );

    @Override
    public final void performHelp() 
    {
        this.getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
    }
    
	protected final IWorkbenchHelpSystem getHelpSystem() {
		return PlatformUI.getWorkbench().getHelpSystem();
	}
}

Lines 18-23 Link Here

(-)src/org/eclipse/jpt/ui/internal/wizards/gen/CascadeDialog.java (+8 lines)
18	import org.eclipse.jface.dialogs.TrayDialog;	18	import org.eclipse.jface.dialogs.TrayDialog;
19	import org.eclipse.jpt.gen.internal2.AssociationRole;	19	import org.eclipse.jpt.gen.internal2.AssociationRole;
20	import org.eclipse.jpt.gen.internal2.util.StringUtil;	20	import org.eclipse.jpt.gen.internal2.util.StringUtil;
		21	import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
21	import org.eclipse.swt.SWT;	22	import org.eclipse.swt.SWT;
22	import org.eclipse.swt.events.SelectionEvent;	23	import org.eclipse.swt.events.SelectionEvent;
23	import org.eclipse.swt.events.SelectionListener;	24	import org.eclipse.swt.events.SelectionListener;
Lines 29-34 Link Here
29	import org.eclipse.swt.widgets.Display;	30	import org.eclipse.swt.widgets.Display;
30	import org.eclipse.swt.widgets.Group;	31	import org.eclipse.swt.widgets.Group;
31	import org.eclipse.swt.widgets.Shell;	32	import org.eclipse.swt.widgets.Shell;
		33	import org.eclipse.ui.PlatformUI;
		34	import org.eclipse.ui.help.IWorkbenchHelpSystem;
32		35
33	/**	36	/**
34	* Simple dialog allows user to set the cascade property of an associationRole.	37	* Simple dialog allows user to set the cascade property of an associationRole.
Lines 69-74 Link Here
69	protected void configureShell(Shell newShell) {	72	protected void configureShell(Shell newShell) {
70	super.configureShell(newShell);	73	super.configureShell(newShell);
71	newShell.setText(JptUiEntityGenMessages.selectCascadeDlgTitle);	74	newShell.setText(JptUiEntityGenMessages.selectCascadeDlgTitle);
		75	this.getHelpSystem().setHelp(newShell, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_SELECT_CASCADE);
72	}	76	}
73		77
74	private void setAssociationRole(AssociationRole role) {	78	private void setAssociationRole(AssociationRole role) {
Lines 148-153 Link Here
148	}	152	}
149	return false;	153	return false;
150	}	154	}
		155
		156	protected final IWorkbenchHelpSystem getHelpSystem() {
		157	return PlatformUI.getWorkbench().getHelpSystem();
		158	}
151		159
152	}	160	}
153		161

Lines 39-44 Link Here

(-)src/org/eclipse/jpt/ui/internal/wizards/gen/JoinColumnsPage.java (-1 / +3 lines)
39	import org.eclipse.jpt.db.Table;	39	import org.eclipse.jpt.db.Table;
40	import org.eclipse.jpt.gen.internal2.Association;	40	import org.eclipse.jpt.gen.internal2.Association;
41	import org.eclipse.jpt.gen.internal2.ORMGenCustomizer;	41	import org.eclipse.jpt.gen.internal2.ORMGenCustomizer;
		42	import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
42	import org.eclipse.jpt.ui.internal.util.SWTUtil;	43	import org.eclipse.jpt.ui.internal.util.SWTUtil;
43	import org.eclipse.jpt.ui.internal.util.TableLayoutComposite;	44	import org.eclipse.jpt.ui.internal.util.TableLayoutComposite;
44	import org.eclipse.swt.SWT;	45	import org.eclipse.swt.SWT;
Lines 89-95 Link Here
89	GridLayout layout = new GridLayout();	90	GridLayout layout = new GridLayout();
90	layout.numColumns = 1;	91	layout.numColumns = 1;
91	composite.setLayout(layout);	92	composite.setLayout(layout);
92		93	this.getHelpSystem().setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_JOIN_COLUMNS);
		94
93	tablesGroup1 = new Composite(composite, SWT.SHADOW_ETCHED_IN);	95	tablesGroup1 = new Composite(composite, SWT.SHADOW_ETCHED_IN);
94	tablesGroup1.setLayoutData(new GridData());	96	tablesGroup1.setLayoutData(new GridData());
95	tablesGroup1.setLayout(new GridLayout(2, false));	97	tablesGroup1.setLayout(new GridLayout(2, false));

Lines 14-19 Link Here

(-)src/org/eclipse/jpt/ui/internal/wizards/gen/NewAssociationWizardPage.java (-1 / +10 lines)
14		14
15	import org.eclipse.jface.wizard.WizardPage;	15	import org.eclipse.jface.wizard.WizardPage;
16	import org.eclipse.jpt.gen.internal2.ORMGenCustomizer;	16	import org.eclipse.jpt.gen.internal2.ORMGenCustomizer;
		17	import org.eclipse.ui.PlatformUI;
		18	import org.eclipse.ui.help.IWorkbenchHelpSystem;
17		19
18		20
19	public abstract class NewAssociationWizardPage extends WizardPage {	21	public abstract class NewAssociationWizardPage extends WizardPage {
Lines 47-51 Link Here
47		49
48	public void updateWithNewTables() {	50	public void updateWithNewTables() {
49	}	51	}
50		52
		53	/**
		54	* Returns the helps system.
		55	* @return The platform's help system
		56	*/
		57	protected final IWorkbenchHelpSystem getHelpSystem() {
		58	return PlatformUI.getWorkbench().getHelpSystem();
		59	}
51	}	60	}

Lines 1-5 Link Here

(-)src/org/eclipse/jpt/ui/internal/JpaHelpContextIds.java (-5 / +24 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 Oracle. All rights reserved.	2	* Copyright (c) 2007, 2009 Oracle. All rights reserved.
3	* This program and the accompanying materials are made available under the terms of	3	* This program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0, which accompanies this distribution and is available at	4	* the Eclipse Public License v1.0, which accompanies this distribution and is available at
5	* http://www.eclipse.org/legal/epl-v10.html.	5	* http://www.eclipse.org/legal/epl-v10.html.
Lines 106-122 Link Here
106	public static final String DIALOG_GENERATE_ENTITIES_TABLES = PREFIX + "dialog_generateEntities_tables";	106	public static final String DIALOG_GENERATE_ENTITIES_TABLES = PREFIX + "dialog_generateEntities_tables";
107	public static final String DIALOG_JPA_FACET = PREFIX + "dialog_JPAFacet";	107	public static final String DIALOG_JPA_FACET = PREFIX + "dialog_JPAFacet";
108	public static final String DIALOG_JPA_PLATFORM = PREFIX + "dialog_JPAPlatform";	108	public static final String DIALOG_JPA_PLATFORM = PREFIX + "dialog_JPAPlatform";
		109
		110	//New JPA Project wizard:
109	public static final String NEW_JPA_PROJECT = PREFIX + "dialog_newJPAProject";	111	public static final String NEW_JPA_PROJECT = PREFIX + "dialog_newJPAProject";
110	public static final String NEW_JPA_PROJECT_CONTENT_PAGE_CLASSPATH = PREFIX + "dialog_addJavaPersistence_classpath";	112	public static final String NEW_JPA_PROJECT_CONTENT_PAGE_CLASSPATH = PREFIX + "dialog_addJavaPersistence_classpath";
111	public static final String NEW_JPA_PROJECT_CONTENT_PAGE_DATABASE = PREFIX + "dialog_addJavaPersistence_database";	113	public static final String NEW_JPA_PROJECT_CONTENT_PAGE_DATABASE = PREFIX + "dialog_addJavaPersistence_database";
112	public static final String NEW_JPA_PROJECT_CONTENT_PAGE_PACKAGING = PREFIX + "dialog_addJavaPersistence_packaging";	114	public static final String NEW_JPA_PROJECT_CONTENT_PAGE_PACKAGING = PREFIX + "dialog_addJavaPersistence_packaging";
113	public static final String NEW_JPA_PROJECT_CREATION_PAGE = PREFIX + "dialog_addJavaPersistence";	115	public static final String NEW_JPA_PROJECT_CREATION_PAGE = PREFIX + "dialog_addJavaPersistence";
		116	public static final String NEW_JPA_PROJECT_JPA_FACET = PREFIX + "dialog_newJPAProjectFacet";
114		117
115	//Other	118	//Other
116	public static final String PERSISTENCE_OUTLINE = PREFIX + "persistenceOutline";	119	public static final String PERSISTENCE_OUTLINE = PREFIX + "persistenceOutline";
117		120
118	//PersistenceUnit	121	//Persistence Xml Editor
119	public static final String PERSISTENCE_UNIT_CONNECTION = PREFIX + "persistenceUnit_connection";	122	public static final String PERSISTENCE_XML_CONNECTION = PREFIX + "persistenceUnit_connection";
120	public static final String PERSISTENCE_UNIT_GENERAL = PREFIX + "persistenceUnit_general";	123	public static final String PERSISTENCE_XML_GENERAL = PREFIX + "persistenceUnit_general";
121	public static final String PERSISTENCE_UNIT_PROPERTIES = PREFIX + "persistenceUnit_properties";	124	public static final String PERSISTENCE_XML_PROPERTIES = PREFIX + "persistence_properties";
		125	public static final String PERSISTENCE_XML_SOURCE = PREFIX + "persistence_source";
		126
		127	//New JPA Entity wizard
		128	public static final String NEW_JPA_ENTITY_ENTITY_CLASS = PREFIX + "dialog_entityClassPage";
		129	public static final String NEW_JPA_ENTITY_ENTITY_PROPERTIES = PREFIX + "dialog_entityPropertiesPage";
		130
		131	//Generate Entities Wizard
		132	public static final String GENERATE_ENTITIES_WIZARD_ASSOCIATION_CARDINALITY = PREFIX + "dialog_associationCardinalityPage";
		133	public static final String GENERATE_ENTITIES_WIZARD_ASSOCIATION_TABLES = PREFIX + "dialog_associationTablesPage";
		134	public static final String GENERATE_ENTITIES_WIZARD_CUSTOMIZE_DEFAULT_ENTITY_GENERATION = PREFIX + "dialog_customizeDefaultEntityGeneration";
		135	public static final String GENERATE_ENTITIES_WIZARD_CUSTOMIZE_INDIVIDUAL_ENTITIES = PREFIX + "dialog_customizeIndividualEntities";
		136	public static final String GENERATE_ENTITIES_WIZARD_JOIN_COLUMNS = PREFIX + "dialog_joinColumnsPage";
		137	public static final String GENERATE_ENTITIES_WIZARD_SELECT_CASCADE = PREFIX + "dialog_selectCascade";
		138	public static final String GENERATE_ENTITIES_WIZARD_SELECT_TABLES = PREFIX + "dialog_selectTablesPage";
		139	public static final String GENERATE_ENTITIES_WIZARD_TABLE_ASSOCIATIONS = PREFIX + "dialog_tableAssociationsPage";
		140
122	}	141	}

Lines 13-18 Link Here

(-)src/org/eclipse/jpt/ui/internal/wizards/entity/EntityFieldsWizardPage.java (-1 / +10 lines)
13		13
14	import org.eclipse.core.runtime.IStatus;	14	import org.eclipse.core.runtime.IStatus;
15	import org.eclipse.jface.dialogs.Dialog;	15	import org.eclipse.jface.dialogs.Dialog;
		16	import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
16	import org.eclipse.jpt.ui.internal.wizards.entity.data.model.IEntityDataModelProperties;	17	import org.eclipse.jpt.ui.internal.wizards.entity.data.model.IEntityDataModelProperties;
17	import org.eclipse.swt.SWT;	18	import org.eclipse.swt.SWT;
18	import org.eclipse.swt.events.SelectionAdapter;	19	import org.eclipse.swt.events.SelectionAdapter;
Lines 24-29 Link Here
24	import org.eclipse.swt.widgets.Group;	25	import org.eclipse.swt.widgets.Group;
25	import org.eclipse.swt.widgets.Label;	26	import org.eclipse.swt.widgets.Label;
26	import org.eclipse.swt.widgets.Text;	27	import org.eclipse.swt.widgets.Text;
		28	import org.eclipse.ui.PlatformUI;
		29	import org.eclipse.ui.help.IWorkbenchHelpSystem;
27	import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;	30	import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
28	import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;	31	import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
29	import org.eclipse.wst.common.frameworks.datamodel.IDataModel;	32	import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
Lines 63-68 Link Here
63	protected Composite createTopLevelComposite(Composite parent) {	66	protected Composite createTopLevelComposite(Composite parent) {
64	Composite composite = new Composite(parent, SWT.NULL);	67	Composite composite = new Composite(parent, SWT.NULL);
65	composite.setLayout(new GridLayout());	68	composite.setLayout(new GridLayout());
		69	this.getHelpSystem().setHelp(composite, JpaHelpContextIds.NEW_JPA_ENTITY_ENTITY_PROPERTIES);
		70
66	GridData data = new GridData(GridData.FILL_BOTH);	71	GridData data = new GridData(GridData.FILL_BOTH);
67	data.widthHint = 300;	72	data.widthHint = 300;
68	data.heightHint = 450;	73	data.heightHint = 450;
Lines 218-224 Link Here
218	tableNameCheckButton.setEnabled(!isNonEntity);	223	tableNameCheckButton.setEnabled(!isNonEntity);
219	tableNameText.setEnabled(!tableNameCheckButton.getSelection());	224	tableNameText.setEnabled(!tableNameCheckButton.getSelection());
220	}	225	}
221	}	226	}
		227
		228	protected final IWorkbenchHelpSystem getHelpSystem() {
		229	return PlatformUI.getWorkbench().getHelpSystem();
		230	}
222	}	231	}
223		232
224		233

Lines 28-33 Link Here

(-)src/org/eclipse/jpt/ui/internal/wizards/entity/EntityClassWizardPage.java (-1 / +10 lines)
28	import org.eclipse.jpt.core.JptCorePlugin;	28	import org.eclipse.jpt.core.JptCorePlugin;
29	import org.eclipse.jpt.core.resource.xml.JpaXmlResource;	29	import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
30	import org.eclipse.jpt.ui.JptUiPlugin;	30	import org.eclipse.jpt.ui.JptUiPlugin;
		31	import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
31	import org.eclipse.jpt.ui.internal.jface.XmlMappingFileViewerFilter;	32	import org.eclipse.jpt.ui.internal.jface.XmlMappingFileViewerFilter;
32	import org.eclipse.jpt.ui.internal.wizards.entity.data.model.IEntityDataModelProperties;	33	import org.eclipse.jpt.ui.internal.wizards.entity.data.model.IEntityDataModelProperties;
33	import org.eclipse.jpt.utility.internal.CollectionTools;	34	import org.eclipse.jpt.utility.internal.CollectionTools;
Lines 46-52 Link Here
46	import org.eclipse.swt.widgets.Label;	47	import org.eclipse.swt.widgets.Label;
47	import org.eclipse.swt.widgets.Shell;	48	import org.eclipse.swt.widgets.Shell;
48	import org.eclipse.swt.widgets.Text;	49	import org.eclipse.swt.widgets.Text;
		50	import org.eclipse.ui.PlatformUI;
49	import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;	51	import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
		52	import org.eclipse.ui.help.IWorkbenchHelpSystem;
50	import org.eclipse.ui.model.WorkbenchContentProvider;	53	import org.eclipse.ui.model.WorkbenchContentProvider;
51	import org.eclipse.ui.model.WorkbenchLabelProvider;	54	import org.eclipse.ui.model.WorkbenchLabelProvider;
52	import org.eclipse.wst.common.frameworks.datamodel.IDataModel;	55	import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
Lines 97-102 Link Here
97	@Override	100	@Override
98	protected Composite createTopLevelComposite(Composite parent) {	101	protected Composite createTopLevelComposite(Composite parent) {
99	Composite composite = super.createTopLevelComposite(parent);	102	Composite composite = super.createTopLevelComposite(parent);
		103	this.getHelpSystem().setHelp(composite, JpaHelpContextIds.NEW_JPA_ENTITY_ENTITY_CLASS);
		104
100	createInheritanceControl(composite);	105	createInheritanceControl(composite);
101	inheritanceButton.addSelectionListener(new SelectionAdapter() {	106	inheritanceButton.addSelectionListener(new SelectionAdapter() {
102	@Override	107	@Override
Lines 379-383 Link Here
379	output = output.replace(File.separatorChar, SLASH);	384	output = output.replace(File.separatorChar, SLASH);
380	return output;	385	return output;
381	}	386	}
382	}	387	}
		388
		389	protected final IWorkbenchHelpSystem getHelpSystem() {
		390	return PlatformUI.getWorkbench().getHelpSystem();
		391	}
383	}	392	}

Return to bug 261107

Lines 65-70 Link Here

(-)src/org/eclipse/jpt/ui/internal/wizards/gen/TablesSelectorWizardPage.java (-4 / +10 lines)
65	import org.eclipse.swt.widgets.TableColumn;	65	import org.eclipse.swt.widgets.TableColumn;
66	import org.eclipse.swt.widgets.TableItem;	66	import org.eclipse.swt.widgets.TableItem;
67	import org.eclipse.ui.PlatformUI;	67	import org.eclipse.ui.PlatformUI;
		68	import org.eclipse.ui.help.IWorkbenchHelpSystem;
68		69
69	class TablesSelectorWizardPage extends WizardPage{	70	class TablesSelectorWizardPage extends WizardPage{
70		71
Lines 125-130 Link Here
125	GridLayout layout = new GridLayout();	126	GridLayout layout = new GridLayout();
126	layout.numColumns = nColumns;	127	layout.numColumns = nColumns;
127	composite.setLayout(layout);	128	composite.setLayout(layout);
		129	this.getHelpSystem().setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_SELECT_TABLES);
128		130
129	this.databaseGroup = createDatabaseGroup(composite, 400);	131	this.databaseGroup = createDatabaseGroup(composite, 400);
130		132
Lines 170-180 Link Here
170	restoreBtn.setLayoutData(gridData);	172	restoreBtn.setLayoutData(gridData);
171		173
172		174
173	PlatformUI.getWorkbench().getHelpSystem().setHelp(this.tableTable.getControl(), JpaHelpContextIds.DIALOG_GENERATE_ENTITIES_TABLES);	175	this.getHelpSystem().setHelp(this.tableTable.getControl(), JpaHelpContextIds.DIALOG_GENERATE_ENTITIES_TABLES);
174		176
175	setControl(composite);	177	this.setControl(composite);
176		178
177	setPageComplete(true);	179	this.setPageComplete(true);
178	}	180	}
179		181
180	@Override	182	@Override
Lines 539-544 Link Here
539	@Override	541	@Override
540	public final void performHelp()	542	public final void performHelp()
541	{	543	{
542	PlatformUI.getWorkbench().getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );	544	this.getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
543	}	545	}
		546
		547	protected final IWorkbenchHelpSystem getHelpSystem() {
		548	return PlatformUI.getWorkbench().getHelpSystem();
		549	}
544	}	550	}