Skip to content

Gurudevtest patch 18 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gurudevtest wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Gurudevtest patch 18 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20894ce
Update DeployWizardApplicationSelectionPage.java
gurudevtest Jul 19, 2021
f7982bb
Update AbstractAddNewAttributeDialog.java
gurudevtest Jul 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions ...ws.eclipse.dynamodb/src/com/amazonaws/eclipse/dynamodb/AbstractAddNewAttributeDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,58 @@ protected void createButtonsForButtonBar(Composite parent) {
super.createButtonsForButtonBar(parent);
validate();
}


private final class LoadEnvironmentsThread extends CancelableThread {
@Override
public void run() {
final List<EnvironmentDescription> environments = new ArrayList<>();
try {
environments.addAll(elasticBeanstalkClient.describeEnvironments().getEnvironments());
} catch (Exception e) {
if (isServiceSignUpException(e)) {
StatusManager.getManager().handle(newServiceSignUpErrorStatus(e), StatusManager.SHOW | StatusManager.LOG);
} else {
Status status = new Status(Status.ERROR, ElasticBeanstalkPlugin.PLUGIN_ID,
"Unable to load existing environments: " + e.getMessage(), e);
StatusManager.getManager().handle(status, StatusManager.LOG);
}
setRunning(false);
return;
}

Display.getDefault().asyncExec(new Runnable() {
@Override
public void run() {
try {
List<String> environmentNames = new ArrayList<>();
for ( EnvironmentDescription environment : environments ) {
// Skip any terminated environments, since we can safely reuse their names
if ( isEnvironmentTerminated(environment) ) {
continue;
}
environmentNames.add(environment.getEnvironmentName());
}
Collections.sort(environmentNames);

synchronized (LoadEnvironmentsThread.this) {
if ( !isCanceled() ) {
existingEnvironmentNames.clear();
existingEnvironmentNames.addAll(environmentNames);
environmentNamesLoaded.setValue(true);
runValidators();
}
}
} finally {
setRunning(false);
}
}
});
}
}

abstract public void validate();

}


48 changes: 0 additions & 48 deletions ...om/amazonaws/eclipse/elasticbeanstalk/server/ui/DeployWizardApplicationSelectionPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,54 +581,6 @@ public void run() {
}
}

private final class LoadEnvironmentsThread extends CancelableThread {
@Override
public void run() {
final List<EnvironmentDescription> environments = new ArrayList<>();
try {
environments.addAll(elasticBeanstalkClient.describeEnvironments().getEnvironments());
} catch (Exception e) {
if (isServiceSignUpException(e)) {
StatusManager.getManager().handle(newServiceSignUpErrorStatus(e), StatusManager.SHOW | StatusManager.LOG);
} else {
Status status = new Status(Status.ERROR, ElasticBeanstalkPlugin.PLUGIN_ID,
"Unable to load existing environments: " + e.getMessage(), e);
StatusManager.getManager().handle(status, StatusManager.LOG);
}
setRunning(false);
return;
}

Display.getDefault().asyncExec(new Runnable() {
@Override
public void run() {
try {
List<String> environmentNames = new ArrayList<>();
for ( EnvironmentDescription environment : environments ) {
// Skip any terminated environments, since we can safely reuse their names
if ( isEnvironmentTerminated(environment) ) {
continue;
}
environmentNames.add(environment.getEnvironmentName());
}
Collections.sort(environmentNames);

synchronized (LoadEnvironmentsThread.this) {
if ( !isCanceled() ) {
existingEnvironmentNames.clear();
existingEnvironmentNames.addAll(environmentNames);
environmentNamesLoaded.setValue(true);
runValidators();
}
}
} finally {
setRunning(false);
}
}
});
}
}

private boolean isEnvironmentTerminated(EnvironmentDescription environment) {
if (environment == null || environment.getStatus() == null) {
return false;
Expand Down