~sandy-carter/bzr4idea/compile_errors

« back to all changes in this revision

Viewing changes to src/bzr4idea/rebase/GitRebaseEditor.java

Committer: Patrik Beno
Date: 2009-04-19 15:37:45 UTC
Revision ID: patrik.beno@gmail.com-20090419153745-xbev8lgb4cvookg7

BZR-79 refactoring: repackaged to bzr4idea

files removed:
src/bzr4idea

files renamed:
src/git4idea/ => src/bzr4idea/

src/bzr4idea/Bzr.java => src/bzr4idea/Bzr.java

src/bzr4idea/BzrException.java => src/bzr4idea/BzrException.java

src/bzr4idea/BzrFileStatus.java => src/bzr4idea/BzrFileStatus.java

src/bzr4idea/util/ => src/bzr4idea/util/

files modified:
layout.xml

src/META-INF/plugin.xml

src/bzr4idea/GitBranch.java

src/bzr4idea/GitContentRevision.java

src/bzr4idea/GitFileRevision.java

src/bzr4idea/GitReference.java

src/bzr4idea/GitRemote.java

src/bzr4idea/GitRevisionNumber.java

src/bzr4idea/GitRevisionSelector.java

src/bzr4idea/GitTag.java

src/bzr4idea/GitUtil.java

src/bzr4idea/GitVcs.java

src/bzr4idea/actions/BasicAction.java

src/bzr4idea/actions/GitAbstractRebaseResumeAction.java

src/bzr4idea/actions/GitAdd.java

src/bzr4idea/actions/GitCheckout.java

src/bzr4idea/actions/GitCurrentBranch.java

src/bzr4idea/actions/GitFetch.java

src/bzr4idea/actions/GitInit.java

src/bzr4idea/actions/GitMenu.java

src/bzr4idea/actions/GitMerge.java

src/bzr4idea/actions/GitMergeTool.java

src/bzr4idea/actions/GitPull.java

src/bzr4idea/actions/GitPush.java

src/bzr4idea/actions/GitRebase.java

src/bzr4idea/actions/GitRebaseAbort.java

src/bzr4idea/actions/GitRebaseActionBase.java

src/bzr4idea/actions/GitRebaseContinue.java

src/bzr4idea/actions/GitRebaseSkip.java

src/bzr4idea/actions/GitRepositoryAction.java

src/bzr4idea/actions/GitResetHead.java

src/bzr4idea/actions/GitRevert.java

src/bzr4idea/actions/GitShowAllSubmittedFilesAction.java

src/bzr4idea/actions/GitStash.java

src/bzr4idea/actions/GitTag.java

src/bzr4idea/actions/GitUnstash.java

src/bzr4idea/annotate/BzrAnnotationProvider.java

src/bzr4idea/annotate/GitFileAnnotation.java

src/bzr4idea/changes/BzrChangeProvider.java

src/bzr4idea/changes/ChangeCollector.java

src/bzr4idea/changes/GitChangeList.java

src/bzr4idea/changes/GitChangeUtils.java

src/bzr4idea/checkin/BzrCheckinEnvironment.java

src/bzr4idea/checkin/GitPushDialog.form

src/bzr4idea/checkin/GitPushDialog.java

src/bzr4idea/checkin/GitPushUtils.java

src/bzr4idea/checkout/GitCheckoutDialog.form

src/bzr4idea/checkout/GitCheckoutDialog.java

src/bzr4idea/checkout/GitCheckoutProvider.java

src/bzr4idea/checkout/GitCloneDialog.form

src/bzr4idea/checkout/GitCloneDialog.java

src/bzr4idea/commands/GitFileUtils.java

src/bzr4idea/commands/GitHandler.java

src/bzr4idea/commands/GitHandlerListener.java

src/bzr4idea/commands/GitHandlerUtil.java

src/bzr4idea/commands/GitLineHandler.java

src/bzr4idea/commands/GitLineHandlerAdapter.java

src/bzr4idea/commands/GitLineHandlerListener.java

src/bzr4idea/commands/GitSimpleHandler.java

src/bzr4idea/commands/ScriptGenerator.java

src/bzr4idea/commands/StringScanner.java

src/bzr4idea/config/BzrVcsSettings.java

src/bzr4idea/config/GitConfigUtil.java

src/bzr4idea/config/GitVcsConfigurable.java

src/bzr4idea/config/GitVcsPanel.form

src/bzr4idea/config/GitVcsPanel.java

src/bzr4idea/config/GitVersion.java

src/bzr4idea/diff/BzrDiffProvider.java

src/bzr4idea/history/BzrHistoryProvider.java

src/bzr4idea/history/GitHistoryTreeProvider.java

src/bzr4idea/history/GitHistoryUtils.java

src/bzr4idea/i18n/GitBundle.java

src/bzr4idea/merge/GitMergeDialog.form

src/bzr4idea/merge/GitMergeDialog.java

src/bzr4idea/merge/GitMergeProvider.java

src/bzr4idea/merge/GitMergeUtil.java

src/bzr4idea/merge/GitPullDialog.form

src/bzr4idea/merge/GitPullDialog.java

src/bzr4idea/merge/MergeChangeCollector.java

src/bzr4idea/rebase/BzrRebaseEditorService.java

src/bzr4idea/rebase/GitRabaseLineListener.java

src/bzr4idea/rebase/GitRebaseActionDialog.form

src/bzr4idea/rebase/GitRebaseActionDialog.java

src/bzr4idea/rebase/GitRebaseDialog.form

src/bzr4idea/rebase/GitRebaseDialog.java

src/bzr4idea/rebase/GitRebaseEditor.form

src/bzr4idea/rebase/GitRebaseEditor.java

src/bzr4idea/rebase/GitRebaseEditorHandler.java

src/bzr4idea/rebase/GitRebaseEditorMain.java

src/bzr4idea/rebase/GitRebaseEntry.java

src/bzr4idea/rebase/GitRebaseUnstructuredEditor.form

src/bzr4idea/rebase/GitRebaseUnstructuredEditor.java

src/bzr4idea/rebase/GitRebaseUtils.java

src/bzr4idea/rollback/BzrRollbackEnvironment.java

src/bzr4idea/ui/CurrentBranchDialog.form

src/bzr4idea/ui/CurrentBranchDialog.java

src/bzr4idea/ui/GitFetchDialog.form

src/bzr4idea/ui/GitFetchDialog.java

src/bzr4idea/ui/GitReferenceValidator.java

src/bzr4idea/ui/GitRefspecAddRefsDialog.form

src/bzr4idea/ui/GitRefspecAddRefsDialog.java

src/bzr4idea/ui/GitRefspecPanel.form

src/bzr4idea/ui/GitRefspecPanel.java

src/bzr4idea/ui/GitResetDialog.form

src/bzr4idea/ui/GitResetDialog.java

src/bzr4idea/ui/GitStashDialog.form

src/bzr4idea/ui/GitStashDialog.java

src/bzr4idea/ui/GitTagDialog.form

src/bzr4idea/ui/GitTagDialog.java

src/bzr4idea/ui/GitUIUtil.java

src/bzr4idea/ui/GitUnstashDialog.form

src/bzr4idea/ui/GitUnstashDialog.java

src/bzr4idea/update/GitUpdateEnvironment.java

src/bzr4idea/update/GitUpdateSession.java

src/bzr4idea/util/IdeaHelper.java

src/bzr4idea/util/UserMessage.java

src/bzr4idea/validators/GitBranchNameValidator.java

src/bzr4idea/vfs/GitVFSListener.java

Show diffs side-by-side

added added

removed removed

src/bzr4idea/rebase/GitRebaseEditor.java

* See the License for the specific language governing permissions and

* limitations under the License.

package git4idea.rebase;

package bzr4idea.rebase;

import com.intellij.openapi.project.Project;

import com.intellij.openapi.ui.DialogWrapper;

import com.intellij.util.ListWithSelection;

import com.intellij.util.ui.ComboBoxTableCellEditor;

import com.intellij.util.ui.ComboBoxTableCellRenderer;

import git4idea.actions.GitShowAllSubmittedFilesAction;

import git4idea.commands.StringScanner;

import git4idea.config.GitConfigUtil;

import git4idea.i18n.GitBundle;

import bzr4idea.actions.GitShowAllSubmittedFilesAction;

import bzr4idea.commands.StringScanner;

import bzr4idea.config.GitConfigUtil;

import bzr4idea.i18n.GitBundle;

import org.jetbrains.annotations.NonNls;

import javax.swing.*;

Older »