Skip to content

Commit e195648

Browse files
briandealwisbriandealwis
committed
Merge remote-tracking branch 'origin/master' into HEAD
2 parents 168d2b7 + 6b53237 commit e195648

45 files changed

Lines changed: 990 additions & 175 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎eclipse/mars/gcp-eclipse-mars.target‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
4-
<target name="GCP for Eclipse Mars" sequenceNumber="1485456851">
4+
<target name="GCP for Eclipse Mars" sequenceNumber="1488904396">
55
<locations>
66
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
77
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -25,8 +25,8 @@
2525
<repository location="http://download.eclipse.org/releases/mars/"/>
2626
</location>
2727
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
28-
<unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="2.0.3.v20160923-1310"/>
29-
<unit id="org.eclipse.epp.logging.aeri.feature.source.feature.group" version="2.0.3.v20160923-1310"/>
28+
<unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="2.0.4.v20170307-1435"/>
29+
<unit id="org.eclipse.epp.logging.aeri.feature.source.feature.group" version="2.0.4.v20170307-1435"/>
3030
<repository location="http://download.eclipse.org/technology/epp/logging/stable/"/>
3131
</location>
3232
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

‎eclipse/oxygen/gcp-eclipse-oxygen.target‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
4-
<target name="GCP for Eclipse Oxygen" sequenceNumber="1486144192">
4+
<target name="GCP for Eclipse Oxygen" sequenceNumber="1488904345">
55
<locations>
66
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
77
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -24,7 +24,6 @@
2424
<unit id="org.eclipse.jetty.servlet" version="9.4.0.v20161208"/>
2525
<unit id="org.eclipse.jetty.server" version="9.4.0.v20161208"/>
2626
<unit id="org.eclipse.jetty.util" version="9.4.0.v20161208"/>
27-
<unit id="ch.qos.logback.slf4j" version="1.0.7.v201505121915"/>
2827
<repository location="http://download.eclipse.org/releases/oxygen/201702031000/"/>
2928
</location>
3029
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

‎features/com.google.cloud.tools.eclipse.suite.e45.feature/feature.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,6 @@
184184
version="0.0.0"
185185
unpack="false"/>
186186

187-
<plugin
188-
id="com.google.cloud.tools.eclipse.aeri"
189-
download-size="0"
190-
install-size="0"
191-
version="0.0.0"
192-
unpack="false"/>
193-
194187
<plugin
195188
id="com.google.cloud.tools.eclipse.jdt.launching"
196189
download-size="0"

‎plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/DeployPreferencesDialog.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.google.cloud.tools.appengine.cloudsdk.CloudSdkNotFoundException;
2323
import com.google.cloud.tools.appengine.cloudsdk.CloudSdkOutOfDateException;
2424
import com.google.cloud.tools.eclipse.appengine.ui.AppEngineImages;
25-
import com.google.cloud.tools.eclipse.googleapis.GoogleApiFactory;
25+
import com.google.cloud.tools.eclipse.googleapis.IGoogleApiFactory;
2626
import com.google.cloud.tools.eclipse.login.IGoogleLoginService;
2727
import com.google.cloud.tools.eclipse.projectselector.ProjectRepository;
2828
import com.google.common.base.Preconditions;
@@ -56,14 +56,19 @@ public class DeployPreferencesDialog extends TitleAreaDialog {
5656
private IProject project;
5757
private IGoogleLoginService loginService;
5858

59+
private IGoogleApiFactory googleApiFactory;
60+
5961
public DeployPreferencesDialog(Shell parentShell, IProject project,
60-
IGoogleLoginService loginService) {
62+
IGoogleLoginService loginService,
63+
IGoogleApiFactory googleApiFactory) {
6164
super(parentShell);
6265

6366
Preconditions.checkNotNull(project, "project is null");
6467
Preconditions.checkNotNull(loginService, "loginService is null");
68+
Preconditions.checkNotNull(googleApiFactory, "googleApiFactory is null");
6569
this.project = project;
6670
this.loginService = loginService;
71+
this.googleApiFactory = googleApiFactory;
6772
}
6873

6974
@Override
@@ -92,7 +97,7 @@ protected Control createDialogArea(final Composite parent) {
9297
Composite container = new Composite(dialogArea, SWT.NONE);
9398
content = new StandardDeployPreferencesPanel(container, project, loginService,
9499
getLayoutChangedHandler(), true /* requireValues */,
95-
new ProjectRepository(new GoogleApiFactory()));
100+
new ProjectRepository(googleApiFactory));
96101
GridDataFactory.fillDefaults().grab(true, false).applyTo(content);
97102

98103
// we pull in Dialog's content margins which are zeroed out by TitleAreaDialog

‎plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/DeployPropertyPage.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.google.cloud.tools.eclipse.appengine.facets.AppEngineFlexFacet;
2020
import com.google.cloud.tools.eclipse.appengine.facets.AppEngineStandardFacet;
21-
import com.google.cloud.tools.eclipse.googleapis.GoogleApiFactory;
21+
import com.google.cloud.tools.eclipse.googleapis.IGoogleApiFactory;
2222
import com.google.cloud.tools.eclipse.login.IGoogleLoginService;
2323
import com.google.cloud.tools.eclipse.projectselector.ProjectRepository;
2424
import com.google.cloud.tools.eclipse.util.AdapterUtil;
@@ -149,14 +149,17 @@ public void setMessage(String newMessage, int newType) {
149149

150150
private DeployPreferencesPanel getPreferencesPanel(IProject project,
151151
IFacetedProject facetedProject, Composite container) {
152+
152153
IGoogleLoginService loginService =
153154
PlatformUI.getWorkbench().getService(IGoogleLoginService.class);
155+
IGoogleApiFactory googleApiFactory =
156+
PlatformUI.getWorkbench().getService(IGoogleApiFactory.class);
154157

155158
if (AppEngineStandardFacet.hasAppEngineFacet(facetedProject)) {
156159
setTitle(Messages.getString("standard.page.title"));
157160
return new StandardDeployPreferencesPanel(
158161
container, project, loginService, getLayoutChangedHandler(), false /* requireValues */,
159-
new ProjectRepository(new GoogleApiFactory()));
162+
new ProjectRepository(googleApiFactory));
160163
} else if (AppEngineFlexFacet.hasAppEngineFacet(facetedProject)) {
161164
setTitle(Messages.getString("flex.page.title"));
162165
return new FlexDeployPreferencesPanel(container, project);

‎plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/StandardDeployPreferencesPanel.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
import org.eclipse.jface.layout.GridDataFactory;
6464
import org.eclipse.jface.layout.GridLayoutFactory;
6565
import org.eclipse.swt.SWT;
66+
import org.eclipse.swt.events.ControlAdapter;
67+
import org.eclipse.swt.events.ControlEvent;
6668
import org.eclipse.swt.graphics.Font;
6769
import org.eclipse.swt.layout.GridData;
6870
import org.eclipse.swt.layout.GridLayout;

‎plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/standard/StandardDeployCommandHandler.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.google.cloud.tools.eclipse.appengine.deploy.ui.DeployConsole;
2626
import com.google.cloud.tools.eclipse.appengine.deploy.ui.DeployPreferencesDialog;
2727
import com.google.cloud.tools.eclipse.appengine.deploy.ui.Messages;
28+
import com.google.cloud.tools.eclipse.googleapis.IGoogleApiFactory;
2829
import com.google.cloud.tools.eclipse.login.IGoogleLoginService;
2930
import com.google.cloud.tools.eclipse.sdk.ui.MessageConsoleWriterOutputLineListener;
3031
import com.google.cloud.tools.eclipse.ui.util.MessageConsoleUtilities;
@@ -86,8 +87,10 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
8687
}
8788

8889
IGoogleLoginService loginService = ServiceUtils.getService(event, IGoogleLoginService.class);
90+
IGoogleApiFactory googleApiFactory = ServiceUtils.getService(event, IGoogleApiFactory.class);
8991
DeployPreferencesDialog dialog =
90-
new DeployPreferencesDialog(HandlerUtil.getActiveShell(event), project, loginService);
92+
new DeployPreferencesDialog(HandlerUtil.getActiveShell(event), project, loginService,
93+
googleApiFactory);
9194
if (dialog.open() == Window.OK) {
9295
launchDeployJob(project, dialog.getCredential());
9396
}

‎plugins/com.google.cloud.tools.eclipse.appengine.facets/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ bin.includes = META-INF/,\
55
plugin.properties,\
66
plugin.xml
77
javacSource=1.7
8-
javacTarget=1.7
8+
javacTarget=1.7

‎plugins/com.google.cloud.tools.eclipse.appengine.flex.test/.project‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
</arguments>
1212
</buildCommand>
1313
<buildCommand>
14-
<name>org.eclipse.m2e.core.maven2Builder</name>
14+
<name>org.eclipse.pde.ManifestBuilder</name>
1515
<arguments>
1616
</arguments>
1717
</buildCommand>
1818
<buildCommand>
19-
<name>org.eclipse.pde.ManifestBuilder</name>
19+
<name>org.eclipse.pde.SchemaBuilder</name>
2020
<arguments>
2121
</arguments>
2222
</buildCommand>
2323
<buildCommand>
24-
<name>org.eclipse.pde.SchemaBuilder</name>
24+
<name>org.eclipse.m2e.core.maven2Builder</name>
2525
<arguments>
2626
</arguments>
2727
</buildCommand>

‎plugins/com.google.cloud.tools.eclipse.appengine.flex.test/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
44
org.eclipse.jdt.core.compiler.compliance=1.7
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
87
org.eclipse.jdt.core.compiler.source=1.7

0 commit comments

Comments
 (0)