MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-07-13 07:36:41 +02:00
parent 92ffb4b355
commit 35acdbe690
3 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeOptionsPanel.java
+17 -2
View File
@@ -1,3 +1,18 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.ide.passwordSafe.config;
import com.intellij.ide.passwordSafe.PasswordSafe;
@@ -49,10 +64,10 @@ public class PasswordSafeOptionsPanel {
myManagePasswordButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if (myPasswordSafe.getMasterKeyProvider().isEmpty()) {
MasterPasswordDialog.resetMasterPasswordDialog(null, myPasswordSafe.getMasterKeyProvider(), PasswordSafeOptionsPanel.class).show();
MasterPasswordDialog.resetMasterPasswordDialog(null, myPasswordSafe.getMasterKeyProvider()).show();
}
else {
MasterPasswordDialog.changeMasterPasswordDialog(null, myPasswordSafe.getMasterKeyProvider(), PasswordSafeOptionsPanel.class).show();
MasterPasswordDialog.changeMasterPasswordDialog(null, myPasswordSafe.getMasterKeyProvider()).show();
}
updateMasterPasswordState();
}
platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafe.java
+1 -5
View File
@@ -173,10 +173,6 @@ public class MasterKeyPasswordSafe extends BasePasswordSafeProvider {
}
}
if (ApplicationManager.getApplication().isHeadlessEnvironment()) {
throw new MasterPasswordUnavailableException("The provider is not available in headless environment");
}
key = invokeAndWait(() -> {
Object key1 = myKey.get().get();
if (key1 instanceof byte[] || key1 instanceof PasswordSafeException && ((PasswordSafeException)key1).justHappened()) {
@@ -184,7 +180,7 @@ public class MasterKeyPasswordSafe extends BasePasswordSafeProvider {
}
try {
if (myDatabase.isEmpty()) {
if (!MasterPasswordDialog.resetMasterPasswordDialog(project, this, requestor).showAndGet()) {
if (!MasterPasswordDialog.resetMasterPasswordDialog(project, this).showAndGet()) {
throw new MasterPasswordUnavailableException("Master password is required to store passwords in the database.");
}
}
platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterPasswordDialog.java
+21 -27
View File
@@ -1,18 +1,18 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.ide.passwordSafe.impl.providers.masterKey;
import com.intellij.ide.passwordSafe.MasterPasswordUnavailableException;
@@ -38,10 +38,6 @@ import java.util.List;
public class MasterPasswordDialog extends DialogWrapper {
private final static int NUMBER_OF_RETRIES = 5;
/**
* @noinspection FieldCanBeLocal
*/
private final Class<?> myRequestor;
private final JPanel myRootPanel = new JPanel(new CardLayout());
private final List<PasswordComponentBase> myComponents = ContainerUtil.newArrayList();
private final DialogWrapperAction myCardAction;
@@ -68,26 +64,24 @@ public class MasterPasswordDialog extends DialogWrapper {
}
public static MasterPasswordDialog resetMasterPasswordDialog(@Nullable Project project,
@NotNull MasterKeyPasswordSafe safe,
@NotNull Class<?> requestor) {
return new MasterPasswordDialog(project, requestor, new ResetPasswordComponent(safe, true));
@NotNull MasterKeyPasswordSafe safe) {
return new MasterPasswordDialog(project, new ResetPasswordComponent(safe, true));
}
public static MasterPasswordDialog changeMasterPasswordDialog(@Nullable Project project,
@NotNull MasterKeyPasswordSafe safe,
Class<?> requestor) {
return new MasterPasswordDialog(project, requestor, new ChangePasswordComponent(safe), new ResetPasswordComponent(safe, false));
@NotNull MasterKeyPasswordSafe safe) {
return new MasterPasswordDialog(project, new ChangePasswordComponent(safe), new ResetPasswordComponent(safe, false));
}
public static MasterPasswordDialog enterMasterPasswordDialog(@Nullable Project project,
@NotNull MasterKeyPasswordSafe safe,
@NotNull Class<?> requestor) {
return new MasterPasswordDialog(project, requestor, new EnterPasswordComponent(safe, requestor), new ResetPasswordComponent(safe, false));
return new MasterPasswordDialog(project, new EnterPasswordComponent(safe, requestor), new ResetPasswordComponent(safe, false));
}
protected MasterPasswordDialog(@Nullable Project project, Class<?> requestor, PasswordComponentBase... components) {
protected MasterPasswordDialog(@Nullable Project project, PasswordComponentBase... components) {
super(project, false);
myRequestor = requestor;
setResizable(false);
assert components.length > 0;
myComponents.addAll(Arrays.asList(components));