diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-04-10 10:54:17 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-04-10 10:54:39 -0700 |
| commit | a3e39abd38575b02d52f05e041d797023938b6d6 (patch) | |
| tree | 9791aa0988b9461354c1b1476b43bcb6b9ea7da4 /plugins | |
| parent | 1fff8e2b7bbcfdea262d3782d4307ca6437da2a3 (diff) | |
| download | idea-a3e39abd38575b02d52f05e041d797023938b6d6.tar.gz | |
Snapshot 1fff8e2b7bbcfdea262d3782d4307ca6437da2a3 from idea/136.1153 of git://git.jetbrains.org/idea/community.git
38fcfd7: try more times to connect.
6ee4e80: Merge remote-tracking branch 'origin/master'
85a331b: Cleanup.
8e1582f: Logging an error in case of absent name.
a33ddd0: Add javadoc for RemoteConnectionType.
c9cea5a9: introduce OrphanGuardian interface
cadf1a7: Revert "hide on UI changes"
62aa21e: avoid status bar update on internal method invoke
c22e314: nashorn conditional breakpoints
f03bc43: cleanup
9372f19: Merge remote-tracking branch 'origin/master'
94f10a8: PY-12367 loop variable should be able to reuse on else clause
1b02460: Merge remote-tracking branch 'origin/master'
c5294ef: hide on UI changes
3259502: fix NavBar blinking and resizing on Color Scheme change due to async tweaking in updateUI
97eddb8: Cosmetic changes
fede9f0: IDEA-122004 Good code red: surefire.forkNumber in pom.xml
ce5b97b: fix UI artifacts after exiting from Presentation Mode
6937b4d: StatusBar doesn't change when perform Prefs -> Appearance -> Custom fonts
30d235a: IdeRepaintManager.checkThreadViolations fix during readExternal()
7346c3a: [log] IDEA-118576 Don't show focus border
cc3e0c5: [log] IDEA-115902 Fix visual artifact on multi-repo indicator
1146cb6: Merge remote-tracking branch 'origin/master'
b991bf2d: PY-11948 Run manage.py Task ignores environment variables defined for Django Console (and Python Console)
4e41daa: IDEA-122035 accept "tip" as a branch name
d8382bb: remove unneeded read actions
d348434: Merge remote-tracking branch 'origin/master'
6248e48: moved unittest tests to env tests
ee3f4a5: IDEA-121966 Multiple-Cursor Jumpy
f8e6cc5: moved doctest tests to env tests
914621c: IDEA-121295 If property part of new property - unable to introduce new property - Maven
db3f6c7: replace tuple with list quick fix for tuple item assignment inspection
e7cd951: Presentation Mode: common font-size fix for all toolwindows with trees
12f048b: Wrap with Exception quick fix for Raising a string exception inspection
0f5ec0d: Propose change signature quick fix for Method signature does not match signature of overridden method inspection
07ecf4d: cleanup
6ac6f4d: IDEA-122049 Mac messages: in some cases parent window is incorrectly detected
5ee2cf2: added remove return statement quick fix for the return from init inspection
1f0a076: IDEA-121995 Code selection is reseted on last line with space if Allow placement of caret inside tabs is enabled
54936df: added rename argument quick fix for the Incorrect call arguments inspection
45020ac: move quick fix to proper place
e909581: IDEA-105935 Facets excluded from detection are still added on maven reimport
57c3cd7: Optimize MavenImporter.getSuitableImporters()
f0d0f8e: do not build VFS for excluded directories
34c32ea: added remove argument quick fix to the Incorrect call arguments inspection
09f5de3: extract variables and method
a145844: EA-54755 - NPE: FoldingUtil.findFoldRegionStartingAtLine
c37d1ba: libs for project templates
f7fad4d: IDEA-88443 (Run Inspection by Name: Inspections with same name are only shown once)
8521b4b: improve description
b65fdb0: show problematic plugins
13cfa13: extract method
06cf300: Merge branch 'master' of git.labs.intellij.net:idea/community
4c2734f: after uninstall of a plugin the button should show "Restart"
1dbe26d: IDEA-121807 - Tomcat Logs doesn't show
02ad525: init nashorn conditional breakpoints
6cd525c: cleanup
1a0161e: cleanup
e939ebe: reverted fix for IDEA-121961 because of failing test
8b32345: after installation of a plugin the button still shows "Install"
e6e0d7d: Merge branch 'master' of git.labs.intellij.net:idea/community
1cb358a: IDEA-85098 Intellij is not supporting groovy-eclipse-compiler
fd27d3b: IDEA-120027 - Import Git-cloud apps from sources - register VCS roots
787d068: filter by custom/bundled
b5950b4: IDEA-120027 - Import Git-cloud apps from sources - single account for all run configurations
53f918f: align text and make header bg match to html bg
cf75116: IDEA-121695 Add managed dependency info on hover over icon
2e5effd: IDEA-121762 Navigate->Select in: for Spring MVC Controller
e301c4e: [log] IDEA-118328 Fix already disposed
5a621a4: updated plugin should have MODIFIED foreground
b46a3bb: hide description on custom plugin panel
f8155ad: add description label
6c9c9f6: added change signature refactoring quick fix to the Incompatible signatures of _new_ and _init_ inspection
bb243be: cleanup
35312e5: Merge remote-tracking branch 'origin/master'
e02ca9c: comment testdata
11cea86: New messages are implemented for jdk7 and latter jdk versions for now.
753497a3: Merge remote-tracking branch 'origin/master'
ec60260: Merge remote-tracking branch 'origin/master'
2a91bce: highlight both incompatible signatures
a314614: Merge remote-tracking branch 'origin/master'
fefdeaf: Merge remote-tracking branch 'origin/master'
4afd85f: Merge branch 'python-fixes'
4b797eb: cleanup
168dbd0: IDEA-117493 Native crash in Mac launcher
88ed475: diff: do not show 'No changes' panel when 'Can not show diff' should be shown
a148809: Merge remote-tracking branch 'origin/master'
88c7d65: lambda completion: strip unnecessary parenthesis, generate parameter names as for override/implement (IDEA-121947)
f738b51: diamonds: incompatible error due to cls class in default package fixed - cls file doesn't process declarations! = need to switch to mirror (IDEA-121866)
2fefd8b: abstract method overrides abstract: distinguish between covariant returns (IDEA-121930)
d851893: testdata for IDEA-121999
b89dc39: testdata for IDEA-121884
7d747c8: new inference: most specific with same functional interface presence
465325a: new inference: nested varargs
144684b: java 8: accept diamonds in method calls
4112118: new inference: choose most specifics between 2 varargs methods
1ee2942: new inference: raw inner class method qualifier fixed (IDEA-121909)
912e13d: add junit4.jar together with hamcrest (IDEA-119626)
10760d9: new inference: process varargs as separate method candidate/separate phase
69c6b7b: java 8 compatibility
62328cf: inspections: completely ignore currently unresolved scopes
fb20169: new inference: reject varargs as method reference target
0f40eb9: new inference: exact method reference is not pertinent to applicability when target type is type parameter
f64d239: rename suggestions: suggest new names for non-variables (IDEA-121982)
05289e4: Guess Python language level from SDKs of opened projects if it's not available for PSI elements
c1346de: codestyle cleanup
ee5f16e: added Add Exception base class quick fix to the Exception doesn't inherit from standard ''Exception'' class inspection
5b8ebf6: EA-54668 - NPE: Breakpoint.setLogEnabled
90c4e07: codestyle cleanup
61b1cb2: do not store reference to PsiElement in qFix, codestyle cleanup, cleanup deprecated method usage
28cc4de: Fix mappings initialization.
41c9f6f: NotNull annotations and checks.
4334ce2: Cleanup (pointless exceptions; field extracted; formatting)
278b8d6: IDEA-121928 Grails 2.3.7 reloading is broken in IntelliJ 13.0.2
bb5986d: IDEA-121938 (serialPersistentFields trips "MismatchedReadAndWriteOfArray" inspection)
93974a3: fix description
58a3377: IDEA-121920 (X/X can be replaced with X - incorrect arithmetic)
7f73d5e: Merge remote-tracking branch 'origin/master'
177f404: Fixed Nullable/NotNull annotations.
f058695: IDEA-54387 (type annotations in introduce parameter)
6bf6d11: Cleanup (pointless exceptions; typos; formatting)
e5fb46b: VcsIntegrationEnablerTest implemented for mock test vcs
c6a1054: IDEA-121990 Filter by old branch fails with exception if full graph is not loaded
7a73eee: IDEA-121961 Debugger: evaluate from variables doesn't include context
e2eaf0d: Support 'overwrite' parameter for maven-resources-plugin.
2acd338: rebase several problems fixed
2ace00e: cleanup deprecated method usage
298c646: @NotNull getStatementList
20269f4: do not store reference to PyFile in add function quickfix
5bd7108: code style cleanup
546c689: get rid of deprecated functions use
85b572b: do not store reference to PsiElement in add field quickfix
a3343a3: Merge remote-tracking branch 'origin/master'
f96d241: turn java messages on
d2d3aa0: IDEA-116134 Inherited maven resource filtering is not applied
532e079: do not suggest python run configuration for scratch files
fc9c134: fix ui under darcula
b00e8a2: [log] IDEA-121992 Recalculate old heads values
813b0dc: Merge remote-tracking branch 'origin/master'
8d41286: Package method for checking version added
4155d62: code style cleanup
757f50b: code style cleanup
f5ac410: cleanup
37c7fca: removed state from add super call quickfix, added tests
08e2f55: refactoring - following CR-IC-4721
c415007: Cleanup (formatting; javadoc)
64c651e: IDEA-54397 (type annotations in override/implement)
3f3e064: IDEA-54396 (type annotations in "Wrap Return Value")
b360456: IDEA-104026 (Java type annotation formatting)
744d7c8: java: "wrap return value" bean formatting fixed
1540e54: Cleanup (pointless exceptions; formatting; nullability)
fb7c097: IDEA-121834 (generic exception substituted)
378b22a: added format specifier quick fix for the python string format inspection
041748c: Package method for checking version addded
35cc71f: eclipse compiler updated to the latest version
7c1a2d6: [git log] Add icon for deep compare function
741e9b9: [log] IDEA-121875 Enable manual commits sorting in VCS that support it
ee27725: make mouse shortcut for adding/removing carets configurable (IDEA-80056)
2ba4ece: Merge remote-tracking branch 'origin/master'
8dd9cc4: added remove dictionary key quick fix for the Dictionary contains duplicate keys inspection
f0a66f7: [log] Fix HashImpl equals
5bd2cdd: [log] HashImpl: remove the caching map
0affa6a: dom: use ReflectionUtil.getClass{Public,Declared}Methods to skip synthetic methods (which change from one java version to another)
aea8f6d: added move except clause quick fix for the Bad except clauses order inspection
39ca570: IDEA-121935 (Inspections: Overloaded variable argument method: every non-problematic method adds a warning)
8d172ac: IDEA-121952 (Java 1.8: "Interface may be annotated with @FunctionalInterface" inspection reports already annotated interfaces)
b1977ea: added Remove assignment quick fix for the Assigning function call that doesn't return anything inspection
81ca41b: test fixed
b6b5a68: fixed PY-11981 "PEP 8 naming convention violation" inspection treats class attributes as function variables
f791db7: fixed PY-10342 Instance attribute defined outside init: detect functions called in init
4d76bdb: Statement list cannot be null
f839260: Merge remote-tracking branch 'origin/master'
6f6d813: fixed PY-12033 PyAbstractClass invalid warning for properties.
85d52dd: IDEA-118296 Impossible to "Prevent App Nap" for the 133.* in MacOSX 10.9 (Mavericks)
c748cef: artwork update for 13.1
2ee2888: attempt to clarify the inspection description
c517b2c: add test
5a0f6fb: Merge remote-tracking branch 'origin/master'
4b96dbf: IDEA-116029 in-place introduce variable name suggestions popup disappears before I can select anything PARTIAL ROLLBACK, fix to be continued...
bd199f1: Merge remote-tracking branch 'origin/master'
b3dfff9: partially reverting 10f6a0f: psi depedent index get buffering status updates because they are applied to unsaved committed documents
255512d: Merge remote-tracking branch 'origin/master'
fa8f612: Move ssh connection provider to remote-run.
1357e2b: use a more memory-efficient structure to hold a long indexed file list
a0885a9: Merge remote-tracking branch 'origin/master'
23b20a8: Merge remote-tracking branch 'origin/master'
69c9865: fix test
bbf4741: - Removed dependency on remote-run in vagrant plugin (PY-12254). - New api for path mappings providers (old left for compatibility with RubyMine and PhpStorm) - Fix launching of Python console for remote interpreter.
e5d9dff: add -> keyword to cpp and make sure it's lexed correctly (IDEA-121906)
5e71180: add a proxy test that fails on java 8
ffa6350: enable new nashorn variables view by default
c60c038: style: remove unnecessary method
965aafa: for unsaved documents with committed state and psi backed index use the same logic as for unsaved documents with plain index
8c56a6b: github tests with wrong notifications fixed
8ce415d: [log] Fix tests. (fix wrong line separators)
ff002de: [log] Remake VcsLogJoiner without recursion.
7ac6e11: [log] IDEA-118947 Implement special highlighting for cherry-pick
881645a: [log] Add ability to listen to possible filter changes
eff05ea: [log] Add ability to reuse branches filter popup
d282a0e: [log] Expose VcsLogRefs into API
3d81303: [log] Expose the VcsLogFilterUi to the API, let set filter value
a54504c: [log] repaint ui after adding highlighter
542550f: [log] make constants final
7066854: [log] Introduce VcsLogDataProvider to the API as part of VcsLogDataHolder
e10b40f: [log] Expose VcsLogUI & DataPack to the vcs-log-api
55c79a0: [log] Make it possible to add VcsLogHighlighters to the log table.
0bca3c6: [log] Remove obsolete CommitCell & its Renderer
61e2ecc: renderValue — add XValue parameter to simplify, why we need to create
b6738e4: Merge branch 'master' of git.labs.intellij.net:idea/community
8e48244: IDEA-119822 - Support Heroku Debug
1052ef2: less garbage
35a1eba: optimisation: use AtomicLazyNullableValue to avoid extra indirection and save memory
cce38ff: cleanup
799041b: notnull
f60abae: NPE protection
e6806dd: remove old code commented code
d7464ee: support run configurations
5717d3a: make public and refactor to make accessible from Search Everywhere
20d9cb0: make public
010566a: IDEA-58818 (SSR: strange highlighting of try-catch in preview pane)
4e1ef49: cleanup
52a92f2: Gradle: detect Scala plugin presence dynamically (to avoid cyclical plugin dependency)
0333bd1: Local History: do not load ignored files and folders into VFS
4fbcf60: cleanup
7a80e9c: fix duplicates and wrong order in search everywhere
48d4765: Platform: check and warn when trying to edit non-project files (do not update notifications, when not necessary)
8358761: IDEA-121898 (Add Don't ignore String for inspection "Number costructor..")
5e097fa: IDEA-121088 (Java Inspections: Type may be weakened readObject() writeObject())
68b7c88: add fourth checkbox to description
cbff651: Platform: check and warn when trying to edit non-project files (disabled in tests)
c0847ee: Merge remote-tracking branch 'origin/master'
590f153: Platform: check and warn when trying to edit non-project files
14a5a6b: gradient colors for buttons
ba067df: initial
774559b: cleanup
9a337d5: IDEA-121494 (Inspection "method overrides private method" can be improved)
cc18c42: add table header with sorters
a4d8900: always use gradient
c559f14: diff: fix UnknownFileType detection
87113dc: re-arrange downloads label
311ff47: github: remove usage of deprecated VcsNotifier API
c3b9b90: [log] IDEA-117553 Optimize details loading: don't parse Changes at once
645caac: 134->136
1168c7b: Cleanup (common method; pointless assertion; formatting)
66eaa91: nashorn: continue variables presentation simplify V8Scope
3627c46: dfa: treat different constants with same values as same (IDEA-121837)
8084cb0: Rebase feature for update project implemented
fc56bcb: Increment hours in comments
044acff: IDEA-121835 "Breakpoints" UI looks clumsy
aa2b1cb: always fold long command line in console (IDEA-121453)
6de56f5: some CharSequence utility methods
defc8ce: IDEA-121800 Live templates are shown in 'Find in Path' dialog if 'autopopup completion' is enabled
dccb826: new inference: cache substitutor for outer call conflict resolution
a5adf26: IDEA-88643 delete item from list of breakpoints by pressing delete key: selection should not return to position 1.
424cffe: [git log] IDEA-121818 Accept HEAD as branch name
a393838: [log] IDEA-121817 Fix keeping selection
70c52ca: [log] Remove the obsolete NoGraphTableModel & simplify the code which used to use it
f41b964: [log] unused
611e758: StringExpressionHelper: JSF->Java-Analysis
54fccb5: IDEA-121828 (Add single member static import intention should be available on incomplete code)
6d2515c: fix IDEA-112499 for single member static imports
811fdf5: fix IDEA-112499 for on demand imports
b52ec5f: IDEA-121784 (Add on demand static import intention not available when single-member static import present)
8853670: IDEA-119908 Smart Step doesn't work for classes generated with java 8
e36425ec: Moved LanguageLevel.forFile() to PyUtil.getLanguageLevelForVirtualFile()
8870abb: Get Python language level from PsiElements where possible instead VirtualFiles
7438ce8: added create property quick fix for the property access inspection
ead71e4: IDEA-121645 Breakpoints conversion: disabled condition is just lost
60fa43c: use constant for history id
15cb81b: continue decouple xdebugger ex ui — XValue/XStackFrame impl
8238972: added Make public quick fix for the protected member access inspection
f471666: fixed NPE in BreakpointManager.getPsiFile
aae9011: Merge branch 'python-fixes'
155f99a: added create property quick fix
d9ae792: IDEA-121806 Breakpoints fail after file modification
e7713c6: test fixed
b5b1518: cleanup
1f2f49e: Platform: do not reverse tabs order on project reopening (IDEA-121816) + new tabs should open on the right (OC-3490)
2b21896: enable multiple carets by default (IDEA-80056)
44646fe: comment added for CPP-147 fix
6da7645: EA-54287 (diagnostic)
eab3611: fixed code style
25c45d1: added rename quick fix to the protected member inspection
d29cdc8: Merge remote-tracking branch 'origin/master'
2527c3a: Merge remote-tracking branch 'origin/master'
6f729cf: EnforcedPlainTextFileTypeManager: pass project as a parameter [CR-IC-4656]
8e176ce: EnforcedPlainTextFileTypeManager: Fix broken file status update sequence (PhpCompletionTest.testExcludedFiles()) [CR-IC-4656]
a5f3040: Use HttpMethod#hasBeenUsed to prevent NPE, if server response was not received
218756a: Merge remote-tracking branch 'origin/master'
3b799e4: filtering templates by frameworks
2670f2d: yellow code
6a440f7: IDEA-121259 Generated toString() placed in incorrect class
3588589: IDEA-121803 (Windows date/time format translation error)
c49bd80: svn: Perform saving all documents during move/rename in SvnFileSystemListener only if operations are related to files under svn - otherwise it could break functionality not related to svn (like renaming file under git) if svn plugin is enabled
b6f778a: disable test navigation outside test roots
43d2b2e: default mapping for SelectAllOccurrences action (IDEA-80056)
da2374a: if facet has associated framework show 'add facet' instead of 'add framework support' dialog in Project Structure (IDEA-120643, IDEA-113833)
594cad9: WEB-10567 Implemented a way to stop run configurations when starting incompatible ones. The idea is that some run configurations may implement CompatibilityAwareRunProfile.isCompatibleWith method and signal that they are not compatible with the run configuration being started so a dialog is displayed to a user and the user can choose to stop incompatible configurations. +review CR-IC
b814f54: IDEA-121403 Live Template: "Surround with tag" should not be applicable while editing XmlAttributeValue
8db0857: better category name
40c45ca: do not add generic builder for "category" templates (e.g. Java FX)
79feee3: EditorActionHandler API cleanup (IDEA-80056)
f4bbcbc: notify listener on task cancellation
a53cccd: IDEA-71048 (test fixed)
4b6b959: system.out removed
3b408e6: Merge remote-tracking branch 'origin/master'
38bdd09: Open terminal in folder that was dragged to it from project view (IDEA-115145).
4586d4a: IDEA-71048 (system date/time formats on Windows)
6a119d1: platform: batch load system date/time formats
c4e7e1f: Cleanup (pointless exceptions; formatting)
177a1d9: drop deprecated stuff
e5740c5: Return true from dispatch in case of event processing.
38764d4: Merge remote-tracking branch 'origin/master'
8f8ef28: IDEA-114457 Undocked 'project' tool window doesn't always automatically hide when I double-click to open a file Animation fix (don't freeze EDT, use Animator), request focus fix.
5ac6d6f: cleanup
e02f4ef: Terminal should override IDE shortcuts by default (IDEA-118837).
fd85821: Merge remote-tracking branch 'origin/master'
026cf99: PY-12022 Clicking "Rerun" button of "Run manage.py Task..." doesn't stop current process
eb2b2db: don't treat live template complete() as second basic completion invocation (HtmlCompletionTest.testXhtmlCompletionInHtml)
6ebe750: dumb-aware actions in the Messages panel
557cca9: IDEA-108072 (Don't suggest to add on-demand static import for the current class)
8d6f72b: IDEA-121756 Don't provide postfix completion options in java string literals
c738a20: IDEA-89020 Disappears value of the variables standing next in Live templates IDEA-121634 Live Template: template is broken with 3+ variables and leading space
31dbd88: use constant empty array (following CR-IC-4606)
8537206: Extract RSS parsing logic and thus remove Atlassian plugin sources completely
1f4a22c: Fix Flex tests + IDEA-121771 <fx:Script> tag autocomplete broken
b08a89d: cache scope attribute keys to reduce daemon garbage
ddd7530: IDEA-121609 Cannot find '+' + using Find in Path
f723320: Merge branch 'master' of git.labs.intellij.net:idea/community
c66ea39: Local History fix: load file children on fileCreated event (second try)
1c7fa2c: IDEA-120027 - Import Git-cloud apps from sources - Heroku
5eab7d1: try single member static import first in live templates
364298f: IDEA-121738 Shift-click in gutter doesn't create 'no suspend' breakpoint anymore
a0a8fe7: fixed editBreakpoint
912e749: diff: do not apply single change multiple times
3403bab: IDEA-12609 diff: do not consider equal changes as conflict
5379407: diff: do not create empty change on applying modified part of 'modified - deleted' conflict
a0c4ea5: diff: rewrite MergeBuilder and MergeList
fc8f64b: merge: rewrite MergeBuilder
90390cf: merge: add test
0adb7cc: @NotNull
bbe7af5: move Inject SQL tip to intelliLang-java
f14856e: speeding up 'Synchronizing output directories': avoid unnecessary rootsChanges events if many output directories were created during compilation (ZD-22766, IDEA-116757)
06b2ee3: fixed PY-11293 namedtuple underscore-methods are not protected
f00ecc2: Merge remote-tracking branch 'origin/master'
2a07097: [git log] don't query ALL when branches to query are specified
397158b: VcsNotifier methods renamed according to their notification groups
24ce9d6: Exception throw for Unit Test mode removed from GitBranchOperation
6ef9934: CPP-147 PSI is build for files from another project +review CR-IC
64ab58d: nullability
c221e1a: cleanup
0d4f12a: nashorn: initial getReceiverVariable impl
5ab90de: continue nashorn: variables view
c750301: nullability
86d092e: nullability
c97dd80: IDEA-98746 Annoying editor tab tooltips Step 2: clicks will hide tooltips & affect the point below; true "contains" for balloons
060290a0: make carets retain valid positions on Tab width changes, when multiple carets are enabled (IDEA-80056)
7325dffa: Changed default language level to Python 2.7
fd361c4: Merge remote-tracking branch 'origin/master'
1a931f9: lambda: unhandled exceptions inside method body should be treated as those inside anonymous classes (IDEA-121741)
a042720: stream migration inspection: preserve comments (IDEA-121679)
b060c81: stream migration inspection: collapse only primitive new initializers (IDEA-121745)
4d87683: fixed PY-12113 Questionable "access to a protected member of a class" inspection in tests
90d0740: IDEA-98746 Annoying editor tab tooltips Step 1: new setting has been added (Editor -> Editor Tabs -> Show tabs tooltip)
e50b960: [git] remove unused MultipleContentsRevision
70bb70d: [log] Added time measurements to the VCS log
66fb815: renamed resolveWithoutImplicits to getResolveContext (which is more meaningfull)
e1ce2db: [log] Synchonize access to the VcsUserRegistry
a29e2b1: [log] DRY
082b273: [log] prohibit repaint during collapse/expand all branches
6f4a2d5: [log] fireTableStructureChanged if graph changes after some action
23396b0: [log] rename updateUI to repaintUI; unwrap: it shouldn't be executed not from EDT.
347647a: [log] handle answer
a631891: [log] No need to set default cursor
8475418: [log] let handleAnswer be in the single place: VcsLogUI.
43f775c: [log] Add support of getContainingBranches method.
480d1ab: [log] Fix wrong collapse branch nodes.
758c07e: [log] Fix bug related with not load commit node.
a944fe6: [log] Create JumpToNotLoadCommitActionRequest.
610219e: [log] VcsLogSorted fixed.
2d748d6: [log] Disabled selection of relative commits.
03a2a25: [log] Fix performance of collapse all action.
75ff6e6: [log] Add LinearBranchesExpansionAction support. (But collapse all may need more time).
6eaa9bf: [log] Add several debug messages.
45da0e7: [log] Disable draw harmonics in filters.
aeff40e: [log] Add graph for filters.
12bb25e: [log] Don't fail for fresh repositories without commits
bfbc9e4: [log] Don't make graph with always-false filters
33a3bf2: some automatic changes in community modules
ca7f8d3: remove unused
cc1b58a: [log] no filter => null, enable new graph by default, temporary return null if no commits match
c153674: [log] temp diagnostics: why graph sometimes disappear
ab4b7ac: [log] VcsLogSorter stub
8a62c27: [log] temp diagnostics: why graph sometimes disappear
4fd20fc: [log] Fix crash, when mouse over empty row.
8af46ee: [log] Add CollapsedMutableGraph.
6cc0435: [log] Add FragmentGenerator.
0859662: [log] Added highlighting relative commits.
8922251: [log] Extract dfs to DfsUtil.
fe36f19: [log] Simple painter fix.
3e9f31b: [log] Fix not load commit node.
90c7bd1: [log] Fix case when not using new graph for filtering & using old graph facade
b6ed824: [log] IDEA-117157 Filter by multiple branches
eeefcfa: [log] use new graph for filtering commits (disabled by default)
56f381b: [git log] Support filtering by several branches
0cfc872: [log] Fix author column width calculation
20aeb1a: [log] Optimize case with filters: read & store commits without details
01121ba: [log] Add arrow highlighted when mouse over.
4421f12: [log] Add GraphActionDispatcher.
ecdc992: [log] Fix Image overflow.
52db2ef: [log] Fix GraphCellGeneratorImpl.
863d8c7: [log] Fix Branch color.
04a0bc7: [log] Use new GraphFacade
dfc41b0: [log] Temp fix SimpleGraphCellPainter
4f028e7: [log] Copy GraphCellPainter from old log.
62dd4f6: [log] Fix graph, when not all log loaded.
84790b5: [log] Add GraphCellGenerator.
3bf48c4: [log] Add MutableGraph and simple Impl
232fe7f: [log] Add PermanentGraph & Layout
413a6a9: [log] Add GraphFlags
3e4e166: [log] Add IntToIntMap, AbstractIntToIntMap, TreeIntToIntMap and TestTreeIntToIntMap
7642e8a: [log] Get rid of VcsLogDataHolder#getDataPack: pass DataPack manually
435fffb: [log] Explicitly pass VcsLogDataHolder & VcsLogUiProperties
270649b: [log] VcsUserRegistry: return a copy of users map, to avoid CCME
5dd7cd9: [log] Extract graph facade building into separate class
691077d: GraphColorManager initial implementation
a615943: [log] remove no more needed dependencies from vcs-log-graph
be34c32: [log] DataPack: create GraphFacadeImpl instance in build
584e37d: [log] Move GraphFacade implementation to vcs-log-graph module
4e968e1: [log] remove unused stuff from the DataPack.
bfcb3f4: Override paintComponent() instead of paint().
99d52e8: [log] Delegate graph painting to the GraphFacade
c152a29: Move clicks & hovers to the GraphFacade
a00646d: GraphColorManager: more methods + javadocs
98b80a1: rename & check link listener first
54a50ae: GraphAnswer interface
f9b9890: rename to GraphFacade
055f10b: optimize search commit by part of hash
d1b69d1: remove getVisibleCommits since we've got getVisibleCommitCount & getCommitAtRow
411a76f: javadocs
bb8b897: optimize getOneOfHeads: store it in Branch instead of the VirtualFile.
cd4728b: Transition to GraphFacade, step 4: click to row
a74518c: Transition to GraphFacade, step 3: expansion actions
9311f2f: Transition to GraphFacade, step 2: setVisibleBranches
89dd596: Transition to GraphFacade, step 1: getVisibleCommits(), getRoot()
e852593: remove unused methods
8661db5: GraphColorManager
81488e4: some javadocs & GraphInfoProvider extraction
039520b: Graph Black Box refactoring initial step
fce20a5: IDEA-121764 Debugger does not show null values
e14e913: IDEA-121739 Debugger doesn't stop on breakpoints in some anonymous classes
675fa42: fix tests. Rebinding for 'def' reference should do nothing because it references to an inferred variable's type or to a variable itself.
5a54361: IDEA-116134 Inherited maven resource filtering is not applied
1766d06: Groovy: fix parameter info
812d0d6: Groovy: remove redundant GrDefaultAnnotationValue psi.
2bc747e: Groovy: import static intention should be available on argument list
cdfdf8d: IDEA-121662 Unify Groovy and Java Intention behavior
82a4f0d: IDEA-121318 optimizing whether place is child of import statement. Actually place can be a child of an import statement only if it is a GrCodeReferenceElement.
400d1ff: one big comparator for ratings, downloads, updates and status
dbe0372: memory leak fixed
3d017bc: Remove unused SOAP classes generated from WSDL. Leave only basic authorization in legacy connector
d6528d3: vcs notification structure refactored and common integration enabler provided f or mercurial vcs IDEA-120440
71e985b: IDEA-118548 Fixed locale settings for Mac - so svn launched from IDEA should get correct locale
5f70222: IDEA-121403 Live Template: "Surround with tag" should not be applicable while editing XmlAttributeValue
0e90d93: avoid boxing/unboxing (following CR-IC-4606)
754e7d9: remote table header
99540a3: register all sorters for available plugins table
60861dd: new sorters
ae5ff21: Merge branch 'python-fixes'
455db27: Fixed names of live templates for dict comprehensions (PY-12307)
b2bbf8b: Typo
4569a1c: Don't suggest the initial name if un-pluralization failed (PY-12308)
816b0e4: Don't suggest collection names in live templates that aren't valid Python identifier (PY-12308)
b8412c1: refactor to support multiple sorters
2814c77: Add bundle for common task messages
a4b56a6: java: formatting of type annotations inside type elements
0813c3c: java: type cast intention fixed
37ec0df: update appinfo files
6ff02b1: optimization for breakpoint set in folded code
09c6a8d: method refs: search for potentially applicable members in supers (IDEA-121737)
5412fbc: overload resolution: grab lambda from nested parenthesis as well as conditional expressions
0c7adaa: java: split multi-catch intention simplified; test data made adequate
4969888: java: no annotations needed in type cast
1687a22: Cleanup (unneeded test data)
333e542: Dictionary extended
9da8f7d: IDEA-121384 Breakpoints dialog: for method breakpoint created in dialog new branch is created
20a0571: notnull
dd09f59: notnull
8aab3af: notnull
9e433b6: data race
6c89ea9: cleanup
da637a4: IDEA-84705 Live Template: should be possible to reset the changes made in default templates
ae81974: Merge remote-tracking branch 'origin/master'
f86ac6f: new inference: use equals bounds during incorporation
e07fdee: testdata for IDEA-118965
46112ee: new inference: cache lambda functional type during expression constraints reduction (IDEA-121315)
5029b3f: new inference: do not prefer specifics based on void return type for both void and value compatible lambdas
a70f823: new inference: postpone argument types calculation
2149ea3: Fixed project leak
1608a84: svn: Perform special check if svn repository supports "merge-info" tracking only when corresponding registry key is set
9142df3: classes from old build system API marked as deprecated (to be removed in IDEA 14)
9b4f8c02: svn: Refactored SvnUtil - removed duplicate methods for checking if svn repository supports "merge-info" tracking
d334d41: IDEA-121688 Added CommitEventType.failedOutOfDate; do not fail if could not convert SVNEventAction to CommitEventType (just log warning)
70aed3f: Merge remote-tracking branch 'origin/master'
ba09765: missing test data
76591fd: dfa: comparison with other variables shouldn't affect a variable's nullability status
2c6cea6: IDEA-121698 Automatically make variables accessed from outer scopes final
6166a0e: don't flush fields for pure method and getter calls (IDEA-117449)
80049df: mention method name in edit contract intention text
c1b03f0: dfa: variables shouldn't be marked unknown if they don't have known constant values
1fd57b4: Close terminal tabs with middle click (IDEA-112321).
6ee5d4f: Terminal should sign as xterm-256color (IDEA-118841).
1cd41f0: Merge remote-tracking branch 'origin/master'
8d167c6: Fix the locale on mac only for pycharm processes creation.
96c2016: IDEA-54434 (type annotations in Convert to Atomic/ThreadLocal)
9ae9623: java: formatting of type annotations inside references
50bf5a3: Cleanup (pointless exceptions; formatting)
d44fab7: fix for exception with list of indexed ids merging
39c8f52: Merge remote-tracking branch 'origin/master'
bd3cf45: Launch terminal with fixed locale (IDEA-116401, IDEA-118832, IDEA-120131).
1b0bc5f: fixed regress introduced by c5819e4 : remove stale index data for removed files that were scheduled to update lazily
61d11c8: nashorn: x variables view
a5c886b: cleanup
4433f97: use SingleAlarm
6822332: Fix locale env vars on mac (IDEA-121713).
8d82a44: IDEA-52034 Implemented option to authenticate svn+ssh repositories using ssh agent (for SVNKit integration) (inspired by @charles-dyfis-net pull request - see issue comments for details)
90b352d: svn: Refactored SSHCredentialsDialog - removed unnecessary code
7f5f956: svn: Updating license info related to svn4idea plugin
cb98865: svn: Upgraded to SVNKit 1.7.11
9d57fb2: Upgraded jna-utils (= platform = jna-platform) to 3.4.0 (now it corresponds to currently used jna 3.4.0) (both jna and jna-utils are downloaded from https://github.com/twall/jna/releases/tag/3.4.0)
d9267b7: Added jsch-agent-proxy library to community
b51333a: IDEA-75033 Implemented feature to automatically switch directory on new branch creation
ee584ce: svn: Refactored AutoSvnUpdater - utility method to run svn updates
97e7ceb: svn: Removed unused classes
d62789b: svn: Refactored SvnConfigurationState - simplify java version checks
7eff048: svn: Make "command line" integration be primary for default svn settings
Change-Id: Idc5975266870a8ad22b9cdd88181a4b53387735f
Diffstat (limited to 'plugins')
306 files changed, 4065 insertions, 21254 deletions
diff --git a/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataLineMarkerProvider.java b/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataLineMarkerProvider.java index 73776916edf3..ce3b5a39a06a 100644 --- a/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataLineMarkerProvider.java +++ b/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataLineMarkerProvider.java @@ -29,6 +29,7 @@ import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -51,6 +52,10 @@ public class TestDataLineMarkerProvider implements LineMarkerProvider { if (ApplicationManager.getApplication().isUnitTestMode()) { return null; } + final VirtualFile file = PsiUtilCore.getVirtualFile(element); + if (file == null || !ProjectFileIndex.SERVICE.getInstance(element.getProject()).isInTestSourceContent(file)) { + return null; + } if (element instanceof PsiMethod) { final PsiMethod method = (PsiMethod)element; if (isTestMethod(method)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties index 013cf2344b2a..fca8a1627600 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties @@ -1422,8 +1422,9 @@ overloaded.methods.with.same.number.parameters.problem.descriptor=Multiple metho overloaded.vararg.method.problem.descriptor=Overloaded variable argument method <code>#ref()</code> #loc overloaded.vararg.constructor.problem.descriptor=Overloaded variable argument constructor <code>#ref()</code> #loc cached.number.constructor.call.display.name=Number constructor call with primitive argument -cached.number.constructor.call.problem.descriptor=Number constructor call with primitive argument <code>#ref</code> #loc +cached.number.constructor.call.problem.descriptor=Number constructor call with primitive argument #loc cached.number.constructor.call.quickfix=Replace with ''{0}.valueOf()'' call +cached.number.constructor.call.ignore.string.arguments.option=Ignore new number expressions with a String argument chained.equality.comparisons.problem.descriptor=Chained equality comparison <code>#ref</code> #loc confusing.octal.escape.sequence.problem.descriptor=Octal escape sequence <code>#ref</code> immediately followed by digit #loc field.accessed.synchronized.and.unsynchronized.option=Simple getters and setters are considered field accesses too diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java index a0eede475587..bf23939f2c86 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2013 Bas Leijdekkers + * Copyright 2006-2014 Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ package com.siyeh.ig.abstraction; +import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel; import com.intellij.openapi.project.Project; @@ -219,6 +220,9 @@ public class TypeMayBeWeakenedInspection extends BaseInspection { containingClass.isInterface()) { return; } + if (JavaHighlightUtil.isSerializationRelatedMethod(method, containingClass)) { + return; + } if (MethodUtils.hasSuper(method)) { // do not try to weaken parameters of methods with // super methods diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedArrayReadWriteInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedArrayReadWriteInspection.java index 900871790a9d..41b391183395 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedArrayReadWriteInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedArrayReadWriteInspection.java @@ -15,6 +15,7 @@ */ package com.siyeh.ig.bugs; +import com.intellij.codeInsight.daemon.impl.analysis.HighlightUtil; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; @@ -80,6 +81,9 @@ public class MismatchedArrayReadWriteInspection extends BaseInspection { if (!field.hasModifierProperty(PsiModifier.PRIVATE)) { return; } + if (HighlightUtil.isSerializationImplicitlyUsedField(field)) { + return; + } final PsiClass containingClass = PsiUtil.getTopLevelClass(field); if (!checkVariable(field, containingClass)) { return; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/InterfaceMayBeAnnotatedFunctionalInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/InterfaceMayBeAnnotatedFunctionalInspection.java index 58fd9e3553aa..7c0c2a377803 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/InterfaceMayBeAnnotatedFunctionalInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/InterfaceMayBeAnnotatedFunctionalInspection.java @@ -15,6 +15,7 @@ */ package com.siyeh.ig.classlayout; +import com.intellij.codeInsight.AnnotationUtil; import com.intellij.codeInsight.intention.AddAnnotationPsiFix; import com.intellij.psi.LambdaHighlightingUtil; import com.intellij.psi.LambdaUtil; @@ -71,7 +72,7 @@ public class InterfaceMayBeAnnotatedFunctionalInspection extends BaseInspection return; } super.visitClass(aClass); - if (!aClass.isInterface()) { + if (!aClass.isInterface() || AnnotationUtil.isAnnotated(aClass, "java.lang.FunctionalInterface", false)) { return; } if (LambdaHighlightingUtil.checkInterfaceFunctional(aClass) != null) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/AbstractMethodOverridesAbstractMethodInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/AbstractMethodOverridesAbstractMethodInspection.java index 28e99d0f221a..1ab70368e8c7 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/AbstractMethodOverridesAbstractMethodInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/AbstractMethodOverridesAbstractMethodInspection.java @@ -217,7 +217,7 @@ public class AbstractMethodOverridesAbstractMethodInspection extends BaseInspect if (aClass == null || superClass == null) return false; final PsiSubstitutor substitutor = TypeConversionUtil.getSuperClassSubstitutor(superClass, aClass, PsiSubstitutor.EMPTY); final PsiType type2 = method2.getReturnType(); - return Comparing.equal(TypeConversionUtil.erasure(type1), TypeConversionUtil.erasure(substitutor.substitute(type2))); + return Comparing.equal(type1, substitutor.substitute(type2)); } private boolean isAbstract(PsiMethod method) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/OverloadedVarargsMethodInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/OverloadedVarargsMethodInspection.java index 8be3f7e20d3f..3eaf078ebe30 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/OverloadedVarargsMethodInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/OverloadedVarargsMethodInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 Bas Leijdekkers + * Copyright 2006-2014 Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -68,6 +68,7 @@ public class OverloadedVarargsMethodInspection extends BaseInspection { for (PsiMethod sameNameMethod : sameNameMethods) { if (!sameNameMethod.equals(method)) { registerMethodError(method, method); + return; } } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CachedNumberConstructorCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CachedNumberConstructorCallInspection.java index 0c3208dd76b8..6964b5624ee1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CachedNumberConstructorCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CachedNumberConstructorCallInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2010 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2014 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.ProblemDescriptor; +import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; @@ -27,7 +28,9 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.PsiReplacementUtil; import com.siyeh.ig.psiutils.ClassUtils; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import javax.swing.*; import java.util.HashSet; import java.util.Set; @@ -43,6 +46,9 @@ public class CachedNumberConstructorCallInspection cachedNumberTypes.add(CommonClassNames.JAVA_LANG_SHORT); } + @SuppressWarnings("PublicField") + public static boolean ignoreStringArguments = false; + @Override @NotNull public String getDisplayName() { @@ -57,6 +63,13 @@ public class CachedNumberConstructorCallInspection "cached.number.constructor.call.problem.descriptor"); } + @Nullable + @Override + public JComponent createOptionsPanel() { + return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("cached.number.constructor.call.ignore.string.arguments.option"), + this, "ignoreStringArguments"); + } + @Override public BaseInspectionVisitor buildVisitor() { return new LongConstructorVisitor(); @@ -142,11 +155,10 @@ public class CachedNumberConstructorCallInspection final PsiExpression argument = arguments[0]; final PsiType argumentType = argument.getType(); if (argumentType == null || - argumentType.equalsToText( - CommonClassNames.JAVA_LANG_STRING)) { + (ignoreStringArguments && argumentType.equalsToText(CommonClassNames.JAVA_LANG_STRING))) { return; } - registerError(expression, expression); + registerNewExpressionError(expression, expression); } } }
\ No newline at end of file diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java index 57af5357f27a..9874e3cddb5d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java @@ -120,7 +120,7 @@ public class PointlessArithmeticExpressionInspection } } else if (tokenType.equals(JavaTokenType.DIV)) { - if (ExpressionUtils.isOne(expression)) { + if (ExpressionUtils.isOne(rhs)) { return lhs.getText(); } return "1"; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/MethodOverridesPrivateMethodInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/MethodOverridesPrivateMethodInspectionBase.java index ff40fb7d9d88..309abda54b7c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/MethodOverridesPrivateMethodInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/MethodOverridesPrivateMethodInspectionBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2007 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2014 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ package com.siyeh.ig.visibility; +import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiModifier; @@ -70,6 +71,9 @@ public class MethodOverridesPrivateMethodInspectionBase extends BaseInspection { if (method.getNameIdentifier() == null) { return; } + if (JavaHighlightUtil.isSerializationRelatedMethod(method, aClass)) { + return; + } PsiClass ancestorClass = aClass.getSuperClass(); final Set<PsiClass> visitedClasses = new HashSet<PsiClass>(); while (ancestorClass != null) { @@ -78,12 +82,9 @@ public class MethodOverridesPrivateMethodInspectionBase extends BaseInspection { } final PsiMethod overridingMethod = ancestorClass.findMethodBySignature(method, false); - if (overridingMethod != null) { - if (overridingMethod.hasModifierProperty( - PsiModifier.PRIVATE)) { - registerMethodError(method); - return; - } + if (overridingMethod != null && overridingMethod.hasModifierProperty(PsiModifier.PRIVATE)) { + registerMethodError(method); + return; } ancestorClass = ancestorClass.getSuperClass(); } diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/CachedNumberConstructorCall.html b/plugins/InspectionGadgets/src/inspectionDescriptions/CachedNumberConstructorCall.html index 7856a995fab7..d9174581c2d2 100644 --- a/plugins/InspectionGadgets/src/inspectionDescriptions/CachedNumberConstructorCall.html +++ b/plugins/InspectionGadgets/src/inspectionDescriptions/CachedNumberConstructorCall.html @@ -7,13 +7,13 @@ Reports any attempt to instantiate a new <b>Long</b>, <b>byte</b> argument. It may be more efficient to use the static method <b>valueOf()</b> here (introduced in Java 5), which will cache objects for values between -128 and -127 inclusive. This inspection ignores calls to number constructors using a -<b>String</b> argument. +127 inclusive. <p> This inspection only reports if the project or module is configured to use a language level of 5.0 or higher. <!-- tooltip end --> <p> - +Use the checkbox below to ignore calls to number constructors with a <b>String</b> argument. +<p> </body> </html>
\ No newline at end of file diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/SerialPersistentFieldsWithWrongSignature.html b/plugins/InspectionGadgets/src/inspectionDescriptions/SerialPersistentFieldsWithWrongSignature.html index 69aaa639906c..5e33049043a8 100644 --- a/plugins/InspectionGadgets/src/inspectionDescriptions/SerialPersistentFieldsWithWrongSignature.html +++ b/plugins/InspectionGadgets/src/inspectionDescriptions/SerialPersistentFieldsWithWrongSignature.html @@ -1,7 +1,9 @@ <html> <body> Reports <b>Serializable</b> classes whose <b>serialPersistentFields</b> field. -is not declared <b>private static final ObjectStreamField</font ></b>. +is not declared <b>private static final ObjectStreamField[]</b>. +If the <b>serialPersistentFields</b> field does not have these modifiers, +the serialization behavior will be as if the field were not declared at all. <!-- tooltip end --> <p> diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/StringBufferReplaceableByString.html b/plugins/InspectionGadgets/src/inspectionDescriptions/StringBufferReplaceableByString.html index 9ab43dec8040..01aab76f96c0 100644 --- a/plugins/InspectionGadgets/src/inspectionDescriptions/StringBufferReplaceableByString.html +++ b/plugins/InspectionGadgets/src/inspectionDescriptions/StringBufferReplaceableByString.html @@ -1,8 +1,10 @@ <html> <body> Reports any variables declared as or uses of <b>java.lang.StringBuffer</b> and <b>java.lang.StringBuilder</b> -which are effectively constant. These may be replaced with <b>java.lang.String</b> expressions which results in simpler and possibly -more efficient code. +which can be replaced with a single <b>java.lang.String</b> concatenation. Using a <b>String</b> concatenation +makes the code shorter and simpler. +This inspection only reports when the resulting concatenation is at least as efficient or more efficient than the original +<b>StringBuffer</b> or <b>StringBuilder</b> use. <!-- tooltip end --> <p> diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/TypeMayBeWeakened.html b/plugins/InspectionGadgets/src/inspectionDescriptions/TypeMayBeWeakened.html index 4b594299a955..63c8a9a227ea 100644 --- a/plugins/InspectionGadgets/src/inspectionDescriptions/TypeMayBeWeakened.html +++ b/plugins/InspectionGadgets/src/inspectionDescriptions/TypeMayBeWeakened.html @@ -23,6 +23,8 @@ Use the third checkbox below to specify if this inspection should warn when a ty weakened to <b>java.lang.Object</b>. Weakening to <b>java.lang.Object</b> is often not very useful. <p> +Use the fourth checkbox below to only report when the type can be weakened to an interface type. +<p> </body> </html>
\ No newline at end of file diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/mismatched_array_read_write/MismatchedArrayReadWrite.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/mismatched_array_read_write/MismatchedArrayReadWrite.java index 8175fcc730a4..beed034bc1ba 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/mismatched_array_read_write/MismatchedArrayReadWrite.java +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/mismatched_array_read_write/MismatchedArrayReadWrite.java @@ -178,4 +178,9 @@ class Toster } } } +} +class Ferrari458Spider implements java.io.Serializable { + private static final java.io.ObjectStreamField[] serialPersistentFields = { + new java.io.ObjectStreamField("b", String.class) + }; }
\ No newline at end of file diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/inheritance/abstract_method_overrides_abstract_method/AbstractMethodOverridesAbstractMethod.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/inheritance/abstract_method_overrides_abstract_method/AbstractMethodOverridesAbstractMethod.java index 7c7d64a3f29c..5cb023abb49f 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/inheritance/abstract_method_overrides_abstract_method/AbstractMethodOverridesAbstractMethod.java +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/inheritance/abstract_method_overrides_abstract_method/AbstractMethodOverridesAbstractMethod.java @@ -78,4 +78,17 @@ class Java8DefaultMethods { System.out.println("sub"); } } -}
\ No newline at end of file +} + +class CovariantReturnTypes { + interface A<T> {} + interface Foo { + A<? extends Number> test(); + } + + interface Bar extends Foo { + @Override + A<Integer> test(); + } +} + diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/pointless_arithmetic_expression/PointlessArithmeticExpression.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/pointless_arithmetic_expression/PointlessArithmeticExpression.java index 5f6231d91802..eaea1bbbdd76 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/pointless_arithmetic_expression/PointlessArithmeticExpression.java +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/pointless_arithmetic_expression/PointlessArithmeticExpression.java @@ -110,4 +110,6 @@ class Main { final Main main = new Main(12); return (CONST + (new Main(5).i) * 8) - (Main.CONST + new Main(5).i * (8)); } + + int one = 5/5; }
\ No newline at end of file diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/pointless_arithmetic_expression/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/pointless_arithmetic_expression/expected.xml index 84ac4f27ddd1..b34b0147fd2f 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/pointless_arithmetic_expression/expected.xml +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/pointless_arithmetic_expression/expected.xml @@ -147,4 +147,11 @@ <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Pointless arithmetic expression</problem_class> <description><code>(CONST + (new Main(5).i) * 8) - (Main.CONST + new Main(5).i * (8))</code> can be replaced with '0' #loc</description> </problem> + + <problem> + <file>PointlessArithmeticExpression.java</file> + <line>114</line> + <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Pointless arithmetic expression</problem_class> + <description><code>5/5</code> can be replaced with '1' #loc</description> + </problem> </problems>
\ No newline at end of file diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/classlayout/InterfaceMayBeAnnotatedFunctionalInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/classlayout/InterfaceMayBeAnnotatedFunctionalInspectionTest.java index 3d41d4123d97..e367b530d8ea 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/classlayout/InterfaceMayBeAnnotatedFunctionalInspectionTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/classlayout/InterfaceMayBeAnnotatedFunctionalInspectionTest.java @@ -44,6 +44,12 @@ public class InterfaceMayBeAnnotatedFunctionalInspectionTest extends LightInspec "}"); } + public void testAlreadyAnnotated() { + doTest("@FunctionalInterface interface Asd {" + + " boolean doSmth();" + + "}"); + } + public void testAnnotationType() { doTest("@interface A {}"); } diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/naming/com/siyeh/ig/naming/OverloadedVarargsMethodInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/naming/com/siyeh/ig/naming/OverloadedVarargsMethodInspectionTest.java new file mode 100644 index 000000000000..ef0f9f7dfd95 --- /dev/null +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/naming/com/siyeh/ig/naming/OverloadedVarargsMethodInspectionTest.java @@ -0,0 +1,40 @@ +/* + * Copyright 2000-2014 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.siyeh.ig.naming.com.siyeh.ig.naming; + +import com.intellij.codeInspection.InspectionProfileEntry; +import com.siyeh.ig.LightInspectionTestCase; +import com.siyeh.ig.naming.OverloadedVarargsMethodInspection; + +/** + * @author Bas Leijdekkers + */ +public class OverloadedVarargsMethodInspectionTest extends LightInspectionTestCase +{ + @Override + protected InspectionProfileEntry getInspection() { + return new OverloadedVarargsMethodInspection(); + } + + public void testOneWarning() { + doTest("class Overload {" + + " public void overload() {}" + + " public void overload(int p1) {}" + + " public void overload(int p1, String p2) {}" + + " public void /*Overloaded variable argument method 'overload()'*/overload/**/(int p1, String p2, String... p3) {}" + + "}"); + } +} diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/numeric/CachedNumberConstructorCallInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/numeric/CachedNumberConstructorCallInspectionTest.java new file mode 100644 index 000000000000..3eff4e682919 --- /dev/null +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/numeric/CachedNumberConstructorCallInspectionTest.java @@ -0,0 +1,33 @@ +/* + * Copyright 2000-2014 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.siyeh.ig.numeric; + +import com.intellij.codeInspection.InspectionProfileEntry; +import com.siyeh.ig.LightInspectionTestCase; + +/** + * @author Bas Leijdekkers + */ +public class CachedNumberConstructorCallInspectionTest extends LightInspectionTestCase { + @Override + protected InspectionProfileEntry getInspection() { + return new CachedNumberConstructorCallInspection(); + } + + public void testSimple() { doStatementTest("new /*Number constructor call with primitive argument*/Integer/**/(1);"); } + public void testStringArgument() { doStatementTest("new /*Number constructor call with primitive argument*/Byte/**/(\"1\");"); } + public void testNoWarn() { doStatementTest("Long.valueOf(1L);"); } +} diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/threading/DoubleCheckedLockingInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/threading/DoubleCheckedLockingInspectionTest.java new file mode 100644 index 000000000000..45cf3702f3cd --- /dev/null +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/threading/DoubleCheckedLockingInspectionTest.java @@ -0,0 +1,62 @@ +/* + * Copyright 2000-2014 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.siyeh.ig.threading; + +import com.intellij.codeInspection.InspectionProfileEntry; +import com.siyeh.ig.LightInspectionTestCase; + +/** + * @author Bas Leijdekkers + */ +public class DoubleCheckedLockingInspectionTest extends LightInspectionTestCase { + + public void testSimple() { + doTest("class A {" + + " private boolean initialized;\n" + + " private void initialize() {\n" + + " /*Double-checked locking*/if/**/ (initialized == false) {\n" + + " synchronized (this) {\n" + + " if (initialized == false) {\n" + + " initialized = true;\n" + + " }\n" + + " }\n" + + " }\n" + + " }\n" + + "}"); + } + + public void testVolatile() { + doTest("class X {" + + " private volatile boolean initialized;\n" + + " private void initialize() {\n" + + " if (initialized == false) {\n" + + " synchronized (this) {\n" + + " if (initialized == false) {\n" + + " initialized = true;\n" + + " }\n" + + " }\n" + + " }\n" + + " }\n" + + "}"); + } + + @Override + protected InspectionProfileEntry getInspection() { + final DoubleCheckedLockingInspection inspection = new DoubleCheckedLockingInspection(); + inspection.ignoreOnVolatileVariables = true; + return inspection; + } +} diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/visibility/MethodOverridesPrivateMethodInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/visibility/MethodOverridesPrivateMethodInspectionTest.java new file mode 100644 index 000000000000..4448ca24f074 --- /dev/null +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/visibility/MethodOverridesPrivateMethodInspectionTest.java @@ -0,0 +1,56 @@ +/* + * Copyright 2000-2014 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.siyeh.ig.visibility; + +import com.intellij.codeInspection.InspectionProfileEntry; +import com.siyeh.ig.LightInspectionTestCase; + +/** + * @author Bas Leijdekkers + */ +public class MethodOverridesPrivateMethodInspectionTest extends LightInspectionTestCase { + + @Override + protected InspectionProfileEntry getInspection() { + return new MethodOverridesPrivateMethodInspection(); + } + + @Override + protected String[] getEnvironmentClasses() { + return new String[] { + "package test;" + + "public class Super implements java.io.Serializable {" + + "private void readObject(java.io.ObjectInputStream s){}" + + "private void writeObject(java.io.ObjectOutputStream s){}" + + "private void other() {}" + + "}" + }; + } + + public void testSerializationMethod() { + doTest("import test.Super;" + + "class A extends Super {" + + " private void readObject(java.io.ObjectInputStream s) {}" + + "}"); + } + + public void testSimple() { + doTest("import test.Super;" + + "class B extends Super {" + + " private void /*Method 'other()' overrides a private method of a superclass*/other/**/() {}" + + "}"); + } +} diff --git a/plugins/IntelliLang/src/META-INF/intellilang-java-support.xml b/plugins/IntelliLang/src/META-INF/intellilang-java-support.xml index cef677728345..f5d9305e6d9b 100644 --- a/plugins/IntelliLang/src/META-INF/intellilang-java-support.xml +++ b/plugins/IntelliLang/src/META-INF/intellilang-java-support.xml @@ -28,6 +28,10 @@ <psi.referenceContributor implementation="org.intellij.plugins.intelliLang.inject.java.LanguageReferenceProvider"/> </extensions> + <extensions defaultExtensionNs="com.intellij"> + <tipAndTrick file="InjectSQLLanguage.html" feature-id="db.console.run.intention"/> + </extensions> + <extensions defaultExtensionNs="org.intellij.intelliLang"> <languageSupport implementation="org.intellij.plugins.intelliLang.inject.java.JavaLanguageInjectionSupport"/> <injectionConfig config="resources/javaInjections.xml"/> diff --git a/plugins/IntelliLang/src/tips/InjectSQLLanguage.html b/plugins/IntelliLang/src/tips/InjectSQLLanguage.html new file mode 100644 index 000000000000..3d2adac1adab --- /dev/null +++ b/plugins/IntelliLang/src/tips/InjectSQLLanguage.html @@ -0,0 +1,19 @@ +<html> +<head> + <link rel="stylesheet" type="text/css" href="css/tips.css"> +</head> +<body> + <p> + Use intention <span class="control">Inject Language</span> <span class="shortcut">&shortcut:ShowIntentionActions;</span> on String literal in Java + class to get code assistance for SQL queries. + </p> + + <p class="image"> + <img src="images/inject_language.png" alt=""></p> + + <p>IntelliJ IDEA will provide syntax highlighting, smart completion, navigation and on-the-fly code analysis for your queries.</p> + + <p class="image"> + <img src="images/assistance_in_sql.png" alt=""></p> +</body> +</html>
\ No newline at end of file diff --git a/plugins/IntelliLang/src/tips/images/assistance_in_sql.png b/plugins/IntelliLang/src/tips/images/assistance_in_sql.png Binary files differnew file mode 100644 index 000000000000..ba432957b5ed --- /dev/null +++ b/plugins/IntelliLang/src/tips/images/assistance_in_sql.png diff --git a/plugins/IntelliLang/src/tips/images/inject_language.png b/plugins/IntelliLang/src/tips/images/inject_language.png Binary files differnew file mode 100644 index 000000000000..56d5059e66b9 --- /dev/null +++ b/plugins/IntelliLang/src/tips/images/inject_language.png diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/SplitMultiCatchIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/SplitMultiCatchIntention.java index c58edc18b433..d6de66af803a 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/SplitMultiCatchIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/SplitMultiCatchIntention.java @@ -16,15 +16,12 @@ package com.siyeh.ipp.exceptions; import com.intellij.psi.*; -import com.intellij.psi.impl.PsiImplUtil; -import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.util.IncorrectOperationException; import com.siyeh.ipp.base.Intention; import com.siyeh.ipp.base.PsiElementPredicate; import org.jetbrains.annotations.NotNull; -import java.util.List; - import static com.intellij.util.ObjectUtils.assertNotNull; public class SplitMultiCatchIntention extends Intention { @@ -56,27 +53,16 @@ public class SplitMultiCatchIntention extends Intention { } final PsiElementFactory factory = JavaPsiFacade.getElementFactory(element.getProject()); - final List<PsiTypeElement> disjunctions = PsiTreeUtil.getChildrenOfTypeAsList(parameter.getTypeElement(), PsiTypeElement.class); - for (int i = 0; i < disjunctions.size(); i++) { + final JavaCodeStyleManager styleManager = JavaCodeStyleManager.getInstance(element.getProject()); + for (PsiType disjunction : ((PsiDisjunctionType)type).getDisjunctions()) { final PsiCatchSection copy = (PsiCatchSection)catchSection.copy(); final PsiTypeElement typeElement = assertNotNull(assertNotNull(copy.getParameter()).getTypeElement()); - final PsiTypeElement newTypeElement = factory.createTypeElementFromText(disjunctions.get(i).getText(), catchSection); - typeElement.replace(newTypeElement); + final PsiTypeElement newTypeElement = factory.createTypeElementFromText(disjunction.getCanonicalText(true), catchSection); + final PsiElement replaced = typeElement.replace(newTypeElement); grandParent.addBefore(copy, catchSection); - - if (i == 0) { - // clear the original from type annotations: they belong to the first disjunction and should not appear in others - final PsiModifierList modifierList = parameter.getModifierList(); - if (modifierList != null) { - for (PsiAnnotation annotation : modifierList.getAnnotations()) { - if (PsiImplUtil.findApplicableTarget(annotation, PsiAnnotation.TargetType.TYPE_USE) == PsiAnnotation.TargetType.TYPE_USE) { - annotation.delete(); - } - } - } - } + styleManager.shortenClassReferences(replaced); } catchSection.delete(); diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/exceptions/splitMultiCatch/TypeAnno.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/exceptions/splitMultiCatch/TypeAnno.java index 9768360bedb6..51b86343d0a8 100644 --- a/plugins/IntentionPowerPak/test/com/siyeh/ipp/exceptions/splitMultiCatch/TypeAnno.java +++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/exceptions/splitMultiCatch/TypeAnno.java @@ -1,5 +1,18 @@ -package com.siyeh.ipp.exceptions.splitMultiCatch; - +/* + * Copyright 2000-2014 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. + */ import java.io.*; import java.lang.annotation.*; diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/exceptions/splitMultiCatch/TypeAnno_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/exceptions/splitMultiCatch/TypeAnno_after.java index d8d23ae53a2a..019809da9690 100644 --- a/plugins/IntentionPowerPak/test/com/siyeh/ipp/exceptions/splitMultiCatch/TypeAnno_after.java +++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/exceptions/splitMultiCatch/TypeAnno_after.java @@ -1,5 +1,18 @@ -package com.siyeh.ipp.exceptions.splitMultiCatch; - +/* + * Copyright 2000-2014 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. + */ import java.io.*; import java.lang.annotation.*; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java index f0e8950bccc1..d6974918378d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java @@ -116,6 +116,10 @@ public final class ExecutionHandler { return true; } + public void onCancel() { + antBuildListener.buildFinished(AntBuildListener.ABORTED, 0); + } + public void run(@NotNull final ProgressIndicator indicator) { try { runBuild(indicator, messageView, buildFile, antBuildListener, commandLine); diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java index d5e3c8aaf5c7..9b74b417a0c8 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java @@ -22,8 +22,7 @@ import com.intellij.ide.util.MemberChooserBuilder; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.LangDataKeys; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.actionSystem.EditorWriteActionHandler; @@ -32,6 +31,7 @@ import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.options.TabbedConfigurable; import com.intellij.openapi.project.Project; +import com.intellij.openapi.ui.ComboBox; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.Disposer; import com.intellij.psi.*; @@ -100,7 +100,7 @@ public class GenerateToStringActionHandlerImpl extends EditorWriteActionHandler builder.setTitle("Generate toString()"); logger.debug("Displaying member chooser dialog"); - SwingUtilities.invokeLater(new Runnable() { + ApplicationManager.getApplication().invokeLater(new Runnable() { public void run() { if (project.isDisposed()) return; final MemberChooser dialog = builder.createBuilder(dialogMembers); @@ -116,7 +116,8 @@ public class GenerateToStringActionHandlerImpl extends EditorWriteActionHandler TemplatesManager.getInstance().setDefaultTemplate(template); if (template.isValidTemplate()) { - GenerateToStringWorker.executeGenerateActionLater(clazz, editor, selectedMembers, template, dialog.isInsertOverrideAnnotation()); + GenerateToStringWorker.executeGenerateActionLater(clazz, editor, selectedMembers, template, + dialog.isInsertOverrideAnnotation()); } else { HintManager.getInstance().showErrorHint(editor, "toString() template '" + template.getFileName() + "' is invalid"); @@ -191,7 +192,7 @@ public class GenerateToStringActionHandlerImpl extends EditorWriteActionHandler final JButton settingsButton = new JButton("Settings"); settingsButton.setMnemonic(KeyEvent.VK_S); - comboBox = new JComboBox(all); + comboBox = new ComboBox(all); settingsButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { final TemplatesPanel ui = new TemplatesPanel(); diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringWorker.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringWorker.java index 5a85d72f8dcd..a9c848702279 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringWorker.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringWorker.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -103,7 +103,7 @@ public class GenerateToStringWorker { * @param template the chosen template to use * @return the policy the user selected (never null) */ - private ConflictResolutionPolicy exitsMethodDialog(TemplateResource template) { + protected ConflictResolutionPolicy exitsMethodDialog(TemplateResource template) { final DuplicationPolicy dupPolicy = config.getReplaceDialogInitialOption(); if (dupPolicy == DuplicationPolicy.ASK) { PsiMethod existingMethod = PsiAdapter.findMethodByName(clazz, template.getTargetMethodName()); diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/config/ReplacePolicy.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/config/ReplacePolicy.java index 72f86b3b637d..e070573d1dad 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/config/ReplacePolicy.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/config/ReplacePolicy.java @@ -40,11 +40,11 @@ public class ReplacePolicy implements ConflictResolutionPolicy { } public PsiMethod applyMethod(PsiClass clazz, PsiMethod existingMethod, @NotNull PsiMethod newMethod, Editor editor) throws IncorrectOperationException { + PsiMethod generatedMethod = DuplicatePolicy.getInstance().applyMethod(clazz, null, newMethod, editor); if (existingMethod != null) { existingMethod.delete(); - existingMethod = null; } - return DuplicatePolicy.getInstance().applyMethod(clazz, existingMethod, newMethod, editor); + return generatedMethod; } public String toString() { diff --git a/plugins/generate-tostring/testSrc/org/jetbrains/generate/tostring/inspection/ToStringGeneratingTest.groovy b/plugins/generate-tostring/testSrc/org/jetbrains/generate/tostring/inspection/ToStringGeneratingTest.groovy new file mode 100644 index 000000000000..b4685b9403e6 --- /dev/null +++ b/plugins/generate-tostring/testSrc/org/jetbrains/generate/tostring/inspection/ToStringGeneratingTest.groovy @@ -0,0 +1,124 @@ +/* + * Copyright 2000-2014 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 org.jetbrains.generate.tostring.inspection + +import com.intellij.openapi.application.Result +import com.intellij.openapi.command.WriteCommandAction +import com.intellij.psi.PsiClass +import com.intellij.psi.PsiFile +import com.intellij.psi.PsiJavaFile +import com.intellij.psi.PsiMember +import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase +import org.jetbrains.annotations.NotNull +import org.jetbrains.generate.tostring.GenerateToStringWorker +import org.jetbrains.generate.tostring.config.ConflictResolutionPolicy +import org.jetbrains.generate.tostring.config.ReplacePolicy +import org.jetbrains.generate.tostring.template.TemplateResource +import org.jetbrains.generate.tostring.template.TemplatesManager + +/** + * Created by Max Medvedev on 07/03/14 + */ +class ToStringGeneratingTest extends LightCodeInsightFixtureTestCase { + public void testDuplicateToStringAnInnerClass() throws Exception { + doTest('''\ +public class Foobar { + private int foo; + private int bar; + + @Override <caret> + public String toString() { + return "Foobar{" + + "foo=" + foo + + ", bar=" + bar + + '}'; + } + + public static class Nested { + } +} +''', '''\ +public class Foobar { + private int foo; + private int bar; + + @Override + public String <caret>toString() { + return "Foobar{" + + "foo=" + foo + + ", bar=" + bar + + '}'; + } + + public static class Nested { + } +} +''', ReplacePolicy.instance) + } + + private void doTest(@NotNull String before, + @NotNull String after, + @NotNull ConflictResolutionPolicy policy, + @NotNull TemplateResource template = findDefaultTemplate()) { + myFixture.configureByText('a.java', before) + + PsiClass clazz = findClass() + Collection<PsiMember> members = collectMembers(clazz) + GenerateToStringWorker worker = buildWorker(clazz, policy) + + new WriteCommandAction(myFixture.project, myFixture.file) { + @Override + protected void run(@NotNull Result result) throws Throwable { + worker.execute(members, template) + } + }.execute() + + myFixture.checkResult(after) + } + + @NotNull + private GenerateToStringWorker buildWorker(@NotNull PsiClass clazz, @NotNull ConflictResolutionPolicy policy) { + new GenerateToStringWorker(clazz, myFixture.editor, true) { + @Override + protected ConflictResolutionPolicy exitsMethodDialog(TemplateResource template) { + policy + } + } + } + + @NotNull + private static TemplateResource findDefaultTemplate() { + Collection<TemplateResource> templates = TemplatesManager.getInstance().getAllTemplates(); + def template = templates.find { it.fileName == "String concat (+)" } + assert template != null + template + } + + @NotNull + private static Collection<PsiMember> collectMembers(@NotNull PsiClass clazz) { + clazz.fields as List + } + + @NotNull + private PsiClass findClass() { + PsiFile file = myFixture.file + assert file instanceof PsiJavaFile + PsiClass[] classes = file.classes + + assert classes.length == 1 + classes[0] + } +} diff --git a/plugins/git4idea/remote-servers-git/remote-servers-git.iml b/plugins/git4idea/remote-servers-git/remote-servers-git.iml index b9f613800a04..154f59125497 100644 --- a/plugins/git4idea/remote-servers-git/remote-servers-git.iml +++ b/plugins/git4idea/remote-servers-git/remote-servers-git.iml @@ -15,6 +15,8 @@ <orderEntry type="module" module-name="remote-servers-impl" /> <orderEntry type="module" module-name="lang-api" /> <orderEntry type="module" module-name="lang-impl" /> + <orderEntry type="module" module-name="idea-ui" /> + <orderEntry type="module" module-name="openapi" /> </component> </module> diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStep.form b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStep.form new file mode 100644 index 000000000000..08bd5c10fa89 --- /dev/null +++ b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStep.form @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.remoteServer.util.importProject.CloudGitChooseAccountStep"> + <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> + <margin top="0" left="0" bottom="0" right="0"/> + <constraints> + <xy x="20" y="20" width="500" height="400"/> + </constraints> + <properties/> + <border type="none"/> + <children> + <component id="f7812" class="javax.swing.JLabel" binding="myTitleLabel"> + <constraints> + <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/> + </constraints> + <properties> + <text value="Choose <cloud> account:"/> + </properties> + </component> + <vspacer id="610f7"> + <constraints> + <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/> + </constraints> + </vspacer> + <grid id="1c3f2" binding="myAccountSelectionPanelPlaceHolder" layout-manager="BorderLayout" hgap="0" vgap="0"> + <constraints> + <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> + </constraints> + <properties/> + <border type="none"/> + <children/> + </grid> + </children> + </grid> +</form> diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStep.java b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStep.java new file mode 100644 index 000000000000..46179e224b7d --- /dev/null +++ b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStep.java @@ -0,0 +1,130 @@ +/* + * Copyright 2000-2014 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.remoteServer.util.importProject; + +import com.intellij.ide.util.importProject.ModuleDescriptor; +import com.intellij.ide.util.importProject.ProjectDescriptor; +import com.intellij.ide.util.projectWizard.ModuleBuilder; +import com.intellij.ide.util.projectWizard.ModuleWizardStep; +import com.intellij.ide.util.projectWizard.importSources.DetectedProjectRoot; +import com.intellij.ide.util.projectWizard.importSources.DetectedSourceRoot; +import com.intellij.ide.util.projectWizard.importSources.ProjectFromSourcesBuilder; +import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.StdModuleTypes; +import com.intellij.openapi.options.ConfigurationException; +import com.intellij.openapi.roots.ModifiableRootModel; +import com.intellij.remoteServer.util.CloudAccountSelectionEditor; +import com.intellij.remoteServer.util.CloudBundle; +import com.intellij.remoteServer.util.CloudDeploymentNameConfiguration; +import com.intellij.util.containers.MultiMap; +import git4idea.actions.GitInit; +import org.jetbrains.annotations.NotNull; + +import javax.swing.*; +import java.io.File; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * @author michael.golubev + */ +public class CloudGitChooseAccountStep<DC extends CloudDeploymentNameConfiguration> extends ModuleWizardStep { + + private JPanel myAccountSelectionPanelPlaceHolder; + private JPanel myMainPanel; + private JLabel myTitleLabel; + + private final CloudGitProjectStructureDetectorBase<DC> myDetector; + private final ProjectFromSourcesBuilder myBuilder; + private final ProjectDescriptor myProjectDescriptor; + + private CloudAccountSelectionEditor<?, DC, ?> myEditor; + + public CloudGitChooseAccountStep(CloudGitProjectStructureDetectorBase<DC> detector, + ProjectFromSourcesBuilder builder, + ProjectDescriptor projectDescriptor) { + myDetector = detector; + myBuilder = builder; + myProjectDescriptor = projectDescriptor; + + myTitleLabel.setText(CloudBundle.getText("choose.account.title", detector.getDetectorId())); + + myEditor = detector.createAccountSelectionEditor(); + myAccountSelectionPanelPlaceHolder.add(myEditor.getMainPanel()); + myEditor.initUI(); + } + + @Override + public JComponent getComponent() { + return myMainPanel; + } + + @Override + public void updateDataModel() { + Collection<DetectedProjectRoot> roots = myBuilder.getProjectRoots(myDetector); + + CloudGitProjectRoot lastProjectRoot = null; + MultiMap<CloudGitProjectRoot, DetectedSourceRoot> project2sourceRoots = new MultiMap<CloudGitProjectRoot, DetectedSourceRoot>(); + + for (DetectedProjectRoot root : roots) { + if (root instanceof CloudGitProjectRoot) { + lastProjectRoot = (CloudGitProjectRoot)root; + project2sourceRoots.put(lastProjectRoot, new ArrayList<DetectedSourceRoot>()); + } + else if (root instanceof DetectedSourceRoot) { + project2sourceRoots.putValue(lastProjectRoot, (DetectedSourceRoot)root); + } + } + + List<ModuleDescriptor> modules = new ArrayList<ModuleDescriptor>(); + for (Map.Entry<CloudGitProjectRoot, Collection<DetectedSourceRoot>> project2sourceRootsEntry : project2sourceRoots.entrySet()) { + final CloudGitProjectRoot projectRoot = project2sourceRootsEntry.getKey(); + final File directory = projectRoot.getDirectory(); + ModuleDescriptor moduleDescriptor = new ModuleDescriptor(directory, StdModuleTypes.JAVA, project2sourceRootsEntry.getValue()); + final String applicationName = projectRoot.getApplicationName(); + moduleDescriptor.addConfigurationUpdater(new ModuleBuilder.ModuleConfigurationUpdater() { + + @Override + public void update(@NotNull Module module, @NotNull ModifiableRootModel rootModel) { + createRunConfiguration(module, applicationName); + GitInit.refreshAndConfigureVcsMappings(module.getProject(), projectRoot.getRepositoryRoot(), directory.getAbsolutePath()); + } + }); + modules.add(moduleDescriptor); + } + myProjectDescriptor.setModules(modules); + } + + @Override + public boolean validate() throws ConfigurationException { + myEditor.validate(); + return super.validate(); + } + + private void createRunConfiguration(Module module, String applicationName) { + DC deploymentConfiguration = myDetector.createDeploymentConfiguration(); + + boolean defaultName = module.getName().equals(applicationName); + deploymentConfiguration.setDefaultDeploymentName(defaultName); + if (!defaultName) { + deploymentConfiguration.setDeploymentName(applicationName); + } + + myEditor.createRunConfiguration(module, deploymentConfiguration); + } +} diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitJavaSourceRoot.java b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitJavaSourceRoot.java new file mode 100644 index 000000000000..0d1267128775 --- /dev/null +++ b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitJavaSourceRoot.java @@ -0,0 +1,39 @@ +/* + * Copyright 2000-2014 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.remoteServer.util.importProject; + +import com.intellij.ide.util.projectWizard.importSources.DetectedSourceRoot; +import com.intellij.ide.util.projectWizard.importSources.JavaModuleSourceRoot; +import org.jetbrains.annotations.NotNull; + +/** + * @author michael.golubev + */ +public class CloudGitJavaSourceRoot extends DetectedSourceRoot { + + private final String myRootTypeName; + + public CloudGitJavaSourceRoot(String rootTypeName, JavaModuleSourceRoot javaSourceRoot) { + super(javaSourceRoot.getDirectory(), javaSourceRoot.getPackagePrefix()); + myRootTypeName = rootTypeName; + } + + @NotNull + @Override + public String getRootTypeName() { + return myRootTypeName; + } +} diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectRoot.java b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectRoot.java new file mode 100644 index 000000000000..b9d6e57e8557 --- /dev/null +++ b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectRoot.java @@ -0,0 +1,64 @@ +/* + * Copyright 2000-2014 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.remoteServer.util.importProject; + +import com.intellij.ide.util.projectWizard.importSources.DetectedProjectRoot; +import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.NotNull; + +import java.io.File; + +/** + * @author michael.golubev + */ +public class CloudGitProjectRoot extends DetectedProjectRoot { + + private final String myRootTypeName; + private final String myJavaSourceRootTypeName; + private final VirtualFile myRepositoryRoot; + private final String myApplicationName; + + public CloudGitProjectRoot(String rootTypeName, + String javaSourceRootTypeName, + @NotNull File directory, + @NotNull VirtualFile repositoryRoot, + String applicationName) { + super(directory); + myRootTypeName = rootTypeName; + myJavaSourceRootTypeName = javaSourceRootTypeName; + myRepositoryRoot = repositoryRoot; + myApplicationName = applicationName; + } + + @NotNull + @Override + public String getRootTypeName() { + return myRootTypeName; + } + + @Override + public boolean canContainRoot(@NotNull DetectedProjectRoot root) { + return myJavaSourceRootTypeName.equals(root.getRootTypeName()); + } + + public String getApplicationName() { + return myApplicationName; + } + + public VirtualFile getRepositoryRoot() { + return myRepositoryRoot; + } +} diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectStructureDetectorBase.java b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectStructureDetectorBase.java new file mode 100644 index 000000000000..ae84cd83b482 --- /dev/null +++ b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectStructureDetectorBase.java @@ -0,0 +1,134 @@ +/* + * Copyright 2000-2014 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.remoteServer.util.importProject; + +import com.intellij.ide.util.importProject.ProjectDescriptor; +import com.intellij.ide.util.projectWizard.ModuleWizardStep; +import com.intellij.ide.util.projectWizard.importSources.DetectedProjectRoot; +import com.intellij.ide.util.projectWizard.importSources.JavaModuleSourceRoot; +import com.intellij.ide.util.projectWizard.importSources.ProjectFromSourcesBuilder; +import com.intellij.ide.util.projectWizard.importSources.ProjectStructureDetector; +import com.intellij.ide.util.projectWizard.importSources.impl.JavaProjectStructureDetector; +import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.project.ProjectManager; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vfs.LocalFileSystem; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.remoteServer.ServerType; +import com.intellij.remoteServer.util.CloudAccountSelectionEditor; +import com.intellij.remoteServer.util.CloudDeploymentNameConfiguration; +import com.intellij.remoteServer.util.CloudGitDeploymentDetector; +import git4idea.GitPlatformFacade; +import git4idea.GitUtil; +import git4idea.repo.GitRepository; +import git4idea.repo.GitRepositoryImpl; +import org.jetbrains.annotations.NotNull; + +import javax.swing.*; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * @author michael.golubev + */ +public abstract class CloudGitProjectStructureDetectorBase<DC extends CloudDeploymentNameConfiguration> extends ProjectStructureDetector { + + private final JavaProjectStructureDetector myJavaDetector = new JavaProjectStructureDetector(); + + private final String myId; + private final String myJavaSourceRootTypeName; + private final CloudGitDeploymentDetector myDeploymentDetector; + + protected CloudGitProjectStructureDetectorBase(ServerType serverType, CloudGitDeploymentDetector deploymentDetector) { + myId = serverType.getPresentableName(); + myJavaSourceRootTypeName = "Java/" + myId; + myDeploymentDetector = deploymentDetector; + } + + @NotNull + @Override + public DirectoryProcessingResult detectRoots(@NotNull File dir, + @NotNull File[] children, + @NotNull File base, + @NotNull List<DetectedProjectRoot> result) { + detectApplicationRoot(dir, result); + + for (DetectedProjectRoot projectRoot : result) { + if ((projectRoot instanceof CloudGitProjectRoot) && FileUtil.isAncestor(projectRoot.getDirectory(), dir, true)) { + return detectJavaRoots(dir, children, base, result); + } + } + + return DirectoryProcessingResult.PROCESS_CHILDREN; + } + + private void detectApplicationRoot(@NotNull File dir, @NotNull List<DetectedProjectRoot> result) { + VirtualFile repositoryRoot = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(dir); + if (repositoryRoot == null) { + return; + } + + final File gitDir = new File(dir, GitUtil.DOT_GIT); + if (!gitDir.exists()) { + return; + } + + Project project = ProjectManager.getInstance().getDefaultProject(); + GitRepository repository + = GitRepositoryImpl.getLightInstance(repositoryRoot, project, ServiceManager.getService(project, GitPlatformFacade.class), project); + repository.update(); + + List<String> applicationNames = myDeploymentDetector.collectApplicationNames(repository); + if (applicationNames.isEmpty()) { + return; + } + + result.add(new CloudGitProjectRoot(myId, myJavaSourceRootTypeName, dir, repositoryRoot, applicationNames.get(0))); + } + + private DirectoryProcessingResult detectJavaRoots(@NotNull File dir, + @NotNull File[] children, + @NotNull File base, + @NotNull List<DetectedProjectRoot> result) { + List<DetectedProjectRoot> detectedJavaRoots = new ArrayList<DetectedProjectRoot>(); + DirectoryProcessingResult processingResult = myJavaDetector.detectRoots(dir, children, base, detectedJavaRoots); + for (DetectedProjectRoot detectedJavaRoot : detectedJavaRoots) { + if (detectedJavaRoot instanceof JavaModuleSourceRoot) { + result.add(new CloudGitJavaSourceRoot(myJavaSourceRootTypeName, (JavaModuleSourceRoot)detectedJavaRoot)); + } + } + return processingResult; + } + + @Override + public String getDetectorId() { + return myId; + } + + @Override + public List<ModuleWizardStep> createWizardSteps(ProjectFromSourcesBuilder builder, + ProjectDescriptor projectDescriptor, + Icon stepIcon) { + return Collections.<ModuleWizardStep>singletonList(new CloudGitChooseAccountStep<DC>(this, builder, projectDescriptor)); + } + + public abstract CloudAccountSelectionEditor<?, DC, ?> createAccountSelectionEditor(); + + public abstract DC createDeploymentConfiguration(); +} diff --git a/plugins/git4idea/resources/icons/DeepCompare.png b/plugins/git4idea/resources/icons/DeepCompare.png Binary files differnew file mode 100644 index 000000000000..1028bd6ff2b6 --- /dev/null +++ b/plugins/git4idea/resources/icons/DeepCompare.png diff --git a/plugins/git4idea/resources/icons/DeepCompare@2x.png b/plugins/git4idea/resources/icons/DeepCompare@2x.png Binary files differnew file mode 100644 index 000000000000..0547de9ccfcc --- /dev/null +++ b/plugins/git4idea/resources/icons/DeepCompare@2x.png diff --git a/plugins/git4idea/resources/icons/DeepCompare@2x_dark.png b/plugins/git4idea/resources/icons/DeepCompare@2x_dark.png Binary files differnew file mode 100644 index 000000000000..84137f73691d --- /dev/null +++ b/plugins/git4idea/resources/icons/DeepCompare@2x_dark.png diff --git a/plugins/git4idea/resources/icons/DeepCompare_dark.png b/plugins/git4idea/resources/icons/DeepCompare_dark.png Binary files differnew file mode 100644 index 000000000000..be569f5c82fb --- /dev/null +++ b/plugins/git4idea/resources/icons/DeepCompare_dark.png diff --git a/plugins/git4idea/resources/icons/Git4ideaIcons.java b/plugins/git4idea/resources/icons/Git4ideaIcons.java index a653a4ea881d..a412053cab87 100644 --- a/plugins/git4idea/resources/icons/Git4ideaIcons.java +++ b/plugins/git4idea/resources/icons/Git4ideaIcons.java @@ -38,6 +38,7 @@ public class Git4ideaIcons { public static final Icon Ball7 = load("/icons/ball7.png"); // 8x8 public static final Icon Branch = load("/icons/branch.png"); // 16x16 public static final Icon CherryPick = load("/icons/cherryPick.png"); // 16x16 + public static final Icon DeepCompare = load("/icons/DeepCompare.png"); // 16x16 public static final Icon Greyball = load("/icons/greyball.png"); // 8x8 public static final Icon Star = load("/icons/star.png"); // 13x13 } diff --git a/plugins/git4idea/src/META-INF/plugin.xml b/plugins/git4idea/src/META-INF/plugin.xml index 8664c8ae51e2..a81039083c16 100644 --- a/plugins/git4idea/src/META-INF/plugin.xml +++ b/plugins/git4idea/src/META-INF/plugin.xml @@ -107,6 +107,9 @@ <group id="Git.Log.Toolbar"> <reference id="Git.CherryPick"/> <add-to-group group-id="Vcs.Log.Toolbar" /> + <action id="Git.Log.DeepCompare" class="git4idea.branch.DeepCompareAction" text="Highlight non-picked commits" + icon="Git4ideaIcons.DeepCompare" + description="Dims those commits which have equivalent changes in the current branch"/> </group> @@ -168,14 +171,13 @@ <projectService serviceInterface="git4idea.MessageManager" serviceImplementation="git4idea.MessageManager"/> - <projectService serviceInterface="git4idea.Notificator" - serviceImplementation="git4idea.Notificator"/> <projectService serviceInterface="git4idea.history.wholeTree.GitLogSettings" serviceImplementation="git4idea.history.wholeTree.GitLogSettings"/> <projectService serviceInterface="git4idea.branch.GitBrancher" serviceImplementation="git4idea.branch.GitBrancherImpl"/> <projectService serviceImplementation="git4idea.log.GitContentRevisionFactory" /> + <projectService serviceImplementation="git4idea.branch.DeepComparatorHolder"/> <applicationService serviceImplementation="git4idea.history.wholeTree.GitCommitsSequentialIndex" serviceInterface="git4idea.history.wholeTree.GitCommitsSequentially"/> diff --git a/plugins/git4idea/src/git4idea/GitCommit.java b/plugins/git4idea/src/git4idea/GitCommit.java index 02a81f0c41af..bd6347a5e891 100644 --- a/plugins/git4idea/src/git4idea/GitCommit.java +++ b/plugins/git4idea/src/git4idea/GitCommit.java @@ -16,14 +16,21 @@ package git4idea; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.ThrowableComputable; +import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.Function; +import com.intellij.util.containers.ContainerUtil; import com.intellij.vcs.log.Hash; import com.intellij.vcs.log.VcsUser; -import com.intellij.vcs.log.impl.VcsFullCommitDetailsImpl; -import git4idea.log.GitContentRevisionFactory; +import com.intellij.vcs.log.impl.VcsChangesLazilyParsedDetails; +import git4idea.history.GitChangesParser; +import git4idea.history.GitLogStatusInfo; import org.jetbrains.annotations.NotNull; +import java.util.Collection; +import java.util.Date; import java.util.List; /** @@ -31,13 +38,58 @@ import java.util.List; * * @author Kirill Likhodedov */ -public final class GitCommit extends VcsFullCommitDetailsImpl { +public final class GitCommit extends VcsChangesLazilyParsedDetails { - public GitCommit(final Project project, @NotNull Hash hash, @NotNull List<Hash> parents, long time, @NotNull VirtualFile root, + public GitCommit(Project project, @NotNull Hash hash, @NotNull List<Hash> parents, long time, @NotNull VirtualFile root, @NotNull String subject, @NotNull VcsUser author, @NotNull String message, @NotNull VcsUser committer, - long authorTime, @NotNull List<Change> changes) { - super(hash, parents, time, root, subject, author, message, committer, authorTime, changes, - GitContentRevisionFactory.getInstance(project)); + long authorTime, @NotNull List<GitLogStatusInfo> reportedChanges) { + super(hash, parents, time, root, subject, author, message, committer, authorTime, + new MyChangesComputable(new Data(project, root, reportedChanges, hash, time, parents))); } + + private static class MyChangesComputable implements ThrowableComputable<Collection<Change>, VcsException> { + + private Data myData; + private Collection<Change> myChanges; + + public MyChangesComputable(Data data) { + myData = data; + } + + @Override + public Collection<Change> compute() throws VcsException { + if (myChanges == null) { + myChanges = GitChangesParser.parse(myData.project, myData.root, myData.changesOutput, myData.hash.asString(), + new Date(myData.time), ContainerUtil.map(myData.parents, new Function<Hash, String>() { + @Override + public String fun(Hash hash) { + return hash.asString(); + } + })); + myData = null; // don't hold the not-yet-parsed string + } + return myChanges; + } + + } + + private static class Data { + private final Project project; + private final VirtualFile root; + private final List<GitLogStatusInfo> changesOutput; + private final Hash hash; + private final long time; + private final List<Hash> parents; + + public Data(Project project, VirtualFile root, List<GitLogStatusInfo> changesOutput, Hash hash, long time, List<Hash> parents) { + this.project = project; + this.root = root; + this.changesOutput = changesOutput; + this.hash = hash; + this.time = time; + this.parents = parents; + } + } + } diff --git a/plugins/git4idea/src/git4idea/GitContentRevision.java b/plugins/git4idea/src/git4idea/GitContentRevision.java index c440b2606d79..68fcb59febf2 100644 --- a/plugins/git4idea/src/git4idea/GitContentRevision.java +++ b/plugins/git4idea/src/git4idea/GitContentRevision.java @@ -30,15 +30,12 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.vcsUtil.VcsFileUtil; import com.intellij.vcsUtil.VcsUtil; import git4idea.util.GitFileUtils; -import git4idea.history.wholeTree.GitBinaryMultipleContentsRevision; -import git4idea.history.wholeTree.GitMultipleContentsRevision; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.File; import java.io.IOException; import java.nio.charset.Charset; -import java.util.List; /** * Git content revision @@ -116,21 +113,6 @@ public class GitContentRevision implements ContentRevision { return myFile.hashCode() + myRevision.hashCode(); } - public static ContentRevision createMultipleParentsRevision(@NotNull Project project, @NotNull final FilePath file, - @NotNull GitRevisionNumber currentRevision, - @NotNull final List<GitRevisionNumber> parentRevisions) throws VcsException { - final GitContentRevision contentRevision = createRevisionImpl(file, currentRevision, project, null); - if (parentRevisions.size() == 1) { - return contentRevision; - } else { - if (contentRevision instanceof GitBinaryContentRevision) { - return new GitBinaryMultipleContentsRevision(file, parentRevisions, (GitBinaryContentRevision) contentRevision); - } else { - return new GitMultipleContentsRevision(file, parentRevisions, contentRevision); - } - } - } - /** * Create revision * diff --git a/plugins/git4idea/src/git4idea/GitPlatformFacade.java b/plugins/git4idea/src/git4idea/GitPlatformFacade.java index d808c1b69724..450936045fd7 100644 --- a/plugins/git4idea/src/git4idea/GitPlatformFacade.java +++ b/plugins/git4idea/src/git4idea/GitPlatformFacade.java @@ -22,9 +22,6 @@ import git4idea.config.GitVcsSettings; import git4idea.repo.GitRepository; import org.jetbrains.annotations.NotNull; -/** - * @author Kirill Likhodedov - */ public interface GitPlatformFacade extends DvcsPlatformFacade { @NotNull @@ -32,8 +29,4 @@ public interface GitPlatformFacade extends DvcsPlatformFacade { @NotNull GitVcsSettings getSettings(Project project); - - @NotNull - Notificator getNotificator(@NotNull Project project); - } diff --git a/plugins/git4idea/src/git4idea/GitPlatformFacadeImpl.java b/plugins/git4idea/src/git4idea/GitPlatformFacadeImpl.java index 09ed8f519e07..24b0d5387b72 100644 --- a/plugins/git4idea/src/git4idea/GitPlatformFacadeImpl.java +++ b/plugins/git4idea/src/git4idea/GitPlatformFacadeImpl.java @@ -24,9 +24,6 @@ import git4idea.config.GitVcsSettings; import git4idea.repo.GitRepositoryManager; import org.jetbrains.annotations.NotNull; -/** - * @author Kirill Likhodedov - */ class GitPlatformFacadeImpl extends DvcsPlatformFacadeImpl implements GitPlatformFacade { @NotNull @@ -37,12 +34,6 @@ class GitPlatformFacadeImpl extends DvcsPlatformFacadeImpl implements GitPlatfor @NotNull @Override - public Notificator getNotificator(@NotNull Project project) { - return Notificator.getInstance(project); - } - - @NotNull - @Override public GitRepositoryManager getRepositoryManager(@NotNull Project project) { return ServiceManager.getService(project, GitRepositoryManager.class); } diff --git a/plugins/git4idea/src/git4idea/GitVcs.java b/plugins/git4idea/src/git4idea/GitVcs.java index 714f6096a3e4..ae6ef8e4a037 100644 --- a/plugins/git4idea/src/git4idea/GitVcs.java +++ b/plugins/git4idea/src/git4idea/GitVcs.java @@ -18,7 +18,8 @@ package git4idea; import com.intellij.dvcs.DvcsUtil; import com.intellij.execution.ui.ConsoleViewContentType; import com.intellij.ide.BrowserUtil; -import com.intellij.notification.*; +import com.intellij.notification.Notification; +import com.intellij.notification.NotificationListener; import com.intellij.notification.impl.NotificationsConfigurationImpl; import com.intellij.openapi.actionSystem.DataKey; import com.intellij.openapi.application.ApplicationManager; @@ -38,7 +39,6 @@ import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.ChangeProvider; import com.intellij.openapi.vcs.changes.CommitExecutor; -import com.intellij.openapi.vcs.changes.ui.ChangesViewContentManager; import com.intellij.openapi.vcs.checkin.CheckinEnvironment; import com.intellij.openapi.vcs.diff.DiffProvider; import com.intellij.openapi.vcs.diff.RevisionSelector; @@ -99,12 +99,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; * Git VCS implementation */ public class GitVcs extends AbstractVcs<CommittedChangeList> { - public static final NotificationGroup NOTIFICATION_GROUP_ID = NotificationGroup.toolWindowGroup( - "Git Messages", ChangesViewContentManager.TOOLWINDOW_ID, true); - public static final NotificationGroup IMPORTANT_ERROR_NOTIFICATION = new NotificationGroup( - "Git Important Messages", NotificationDisplayType.STICKY_BALLOON, true); - public static final NotificationGroup MINOR_NOTIFICATION = new NotificationGroup( - "Git Minor Notifications", NotificationDisplayType.BALLOON, true); static { NotificationsConfigurationImpl.remove("Git"); @@ -455,18 +449,21 @@ public class GitVcs extends AbstractVcs<CommittedChangeList> { String message = String.format("The <a href='" + SETTINGS_LINK + "'>configured</a> version of Git is not supported: %s.<br/> " + "The minimal supported version is %s. Please <a href='" + UPDATE_LINK + "'>update</a>.", myVersion, GitVersion.MIN); - IMPORTANT_ERROR_NOTIFICATION.createNotification("Unsupported Git version", message, NotificationType.ERROR, - new NotificationListener.Adapter() { - @Override - protected void hyperlinkActivated(@NotNull Notification notification, @NotNull HyperlinkEvent e) { - if (SETTINGS_LINK.equals(e.getDescription())) { - ShowSettingsUtil.getInstance().showSettingsDialog(myProject, getConfigurable().getDisplayName()); - } - else if (UPDATE_LINK.equals(e.getDescription())) { - BrowserUtil.browse("http://git-scm.com"); - } - } - }).notify(myProject); + VcsNotifier.getInstance(myProject).notifyError("Unsupported Git version", message, + new NotificationListener.Adapter() { + @Override + protected void hyperlinkActivated(@NotNull Notification notification, + @NotNull HyperlinkEvent e) { + if (SETTINGS_LINK.equals(e.getDescription())) { + ShowSettingsUtil.getInstance() + .showSettingsDialog(myProject, getConfigurable().getDisplayName()); + } + else if (UPDATE_LINK.equals(e.getDescription())) { + BrowserUtil.browse("http://git-scm.com"); + } + } + } + ); } } catch (Exception e) { if (getExecutableValidator().checkExecutableAndNotifyIfNeeded()) { // check executable before notifying error @@ -587,7 +584,7 @@ public class GitVcs extends AbstractVcs<CommittedChangeList> { ApplicationManager.getApplication().executeOnPooledThread(new Runnable() { public void run() { Collection<VcsRoot> roots = ServiceManager.getService(myProject, VcsRootDetector.class).detect(); - new GitIntegrationEnabler(myProject, myGit, myPlatformFacade).enable(roots); + new GitIntegrationEnabler(GitVcs.this, myGit).enable(roots); } }); } diff --git a/plugins/git4idea/src/git4idea/Notificator.java b/plugins/git4idea/src/git4idea/Notificator.java deleted file mode 100644 index 9943af7cf3e4..000000000000 --- a/plugins/git4idea/src/git4idea/Notificator.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright 2000-2012 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 git4idea; - -import com.intellij.notification.Notification; -import com.intellij.notification.NotificationGroup; -import com.intellij.notification.NotificationListener; -import com.intellij.notification.NotificationType; -import com.intellij.openapi.components.ServiceManager; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.text.StringUtil; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * @author Kirill Likhodedov - */ -public class Notificator { - - private final @NotNull Project myProject; - - public static Notificator getInstance(@NotNull Project project) { - return ServiceManager.getService(project, Notificator.class); - } - - public Notificator(@NotNull Project project) { - myProject = project; - } - - @NotNull - public static Notification createNotification(@NotNull NotificationGroup notificationGroup, - @NotNull String title, @NotNull String message, @NotNull NotificationType type, - @Nullable NotificationListener listener) { - // title can be empty; description can't be neither null, nor empty - if (StringUtil.isEmptyOrSpaces(message)) { - message = title; - title = ""; - } - // if both title and description were empty, then it is a problem in the calling code => Notifications engine assertion will notify. - return notificationGroup.createNotification(title, message, type, listener); - } - - public void notify(@NotNull Notification notification) { - notification.notify(myProject); - } - - public void notify(@NotNull NotificationGroup notificationGroup, @NotNull String title, @NotNull String message, - @NotNull NotificationType type, @Nullable NotificationListener listener) { - createNotification(notificationGroup, title, message, type, listener).notify(myProject); - } - - public void notify(@NotNull NotificationGroup notificationGroup, @NotNull String title, @NotNull String message, - @NotNull NotificationType type) { - notify(notificationGroup, title, message, type, null); - } - - public void notifyError(@NotNull String title, @NotNull String message) { - notifyError(title, message, null); - } - - public void notifyError(@NotNull String title, @NotNull String message, @Nullable NotificationListener listener) { - notify(GitVcs.IMPORTANT_ERROR_NOTIFICATION, title, message, NotificationType.ERROR, listener); - } - - public void notifySuccess(@NotNull String title, @NotNull String message) { - notify(GitVcs.NOTIFICATION_GROUP_ID, title, message, NotificationType.INFORMATION, null); - } - - public void notifyWeakWarning(@NotNull String title, @NotNull String message, @Nullable NotificationListener listener) { - notify(GitVcs.MINOR_NOTIFICATION, title, message, NotificationType.WARNING, listener); - } - - public void notifyStrongWarning(@NotNull String title, @NotNull String content, @Nullable NotificationListener listener) { - notify(GitVcs.IMPORTANT_ERROR_NOTIFICATION, title, content, NotificationType.WARNING, listener); - } - -} diff --git a/plugins/git4idea/src/git4idea/actions/GitCompareWithBranchAction.java b/plugins/git4idea/src/git4idea/actions/GitCompareWithBranchAction.java index 231fd8e6d5d1..f0ad3b7a5e31 100644 --- a/plugins/git4idea/src/git4idea/actions/GitCompareWithBranchAction.java +++ b/plugins/git4idea/src/git4idea/actions/GitCompareWithBranchAction.java @@ -15,10 +15,8 @@ */ package git4idea.actions; -import com.intellij.notification.NotificationType; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.DumbAwareAction; @@ -214,7 +212,7 @@ public class GitCompareWithBranchAction extends DumbAwareAction { GitUIUtil.notifyMessage(project, GitUtil.fileOrFolder(file) + " doesn't exist in branch", String.format("%s <code>%s</code> doesn't exist in branch <code>%s</code>", GitUtil.fileOrFolder(file), file.getPresentableUrl(), branchToCompare), - NotificationType.WARNING, true, null); + false, null); } } diff --git a/plugins/git4idea/src/git4idea/actions/GitInit.java b/plugins/git4idea/src/git4idea/actions/GitInit.java index aec2fb6d5b51..7d6a7f3945e9 100644 --- a/plugins/git4idea/src/git4idea/actions/GitInit.java +++ b/plugins/git4idea/src/git4idea/actions/GitInit.java @@ -15,7 +15,6 @@ */ package git4idea.actions; -import com.intellij.notification.NotificationType; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.components.ServiceManager; @@ -31,6 +30,7 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsDirectoryMapping; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.Consumer; import com.intellij.vcsUtil.VcsFileUtil; @@ -39,7 +39,6 @@ import git4idea.GitVcs; import git4idea.commands.Git; import git4idea.commands.GitCommandResult; import git4idea.i18n.GitBundle; -import git4idea.util.GitUIUtil; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -85,8 +84,7 @@ public class GitInit extends DumbAwareAction { if (!result.success()) { GitVcs vcs = GitVcs.getInstance(project); if (vcs != null && vcs.getExecutableValidator().checkExecutableAndNotifyIfNeeded()) { - GitUIUtil.notify(GitVcs.IMPORTANT_ERROR_NOTIFICATION, project, "Git init failed", result.getErrorOutputAsHtmlString(), - NotificationType.ERROR, null); + VcsNotifier.getInstance(project).notifyError("Git init failed", result.getErrorOutputAsHtmlString()); } return; } diff --git a/plugins/git4idea/src/git4idea/branch/DeepComparator.java b/plugins/git4idea/src/git4idea/branch/DeepComparator.java new file mode 100644 index 000000000000..1b46c6735f84 --- /dev/null +++ b/plugins/git4idea/src/git4idea/branch/DeepComparator.java @@ -0,0 +1,264 @@ +/* + * Copyright 2000-2014 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 git4idea.branch; + +import com.intellij.openapi.Disposable; +import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.progress.ProgressIndicator; +import com.intellij.openapi.progress.Task; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.Key; +import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.ui.JBColor; +import com.intellij.util.containers.ContainerUtil; +import com.intellij.vcs.log.*; +import com.intellij.vcs.log.data.DataPack; +import com.intellij.vcs.log.data.VcsLogDataHolder; +import com.intellij.vcs.log.data.VcsLogRefreshListener; +import com.intellij.vcs.log.impl.HashImpl; +import git4idea.GitBranch; +import git4idea.commands.GitCommand; +import git4idea.commands.GitLineHandler; +import git4idea.commands.GitLineHandlerAdapter; +import git4idea.repo.GitRepository; +import git4idea.repo.GitRepositoryManager; +import gnu.trove.TIntHashSet; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.awt.*; +import java.util.Map; + +public class DeepComparator implements Disposable { + + private static final Logger LOG = Logger.getInstance(DeepComparator.class); + + @NotNull private final Project myProject; + @NotNull private final GitRepositoryManager myRepositoryManager; + @NotNull private final VcsLogUi myUi; + @NotNull private final VcsLogFilterChangeListener myFilterChangeListener; + + @Nullable private VcsLogHighlighter myHighlighter; + @Nullable private MyTask myTask; + + @NotNull + public static DeepComparator getInstance(@NotNull Project project, @NotNull VcsLogUi ui) { + DeepComparatorHolder holder = ServiceManager.getService(project, DeepComparatorHolder.class); + return holder.getInstance(ui); + } + + DeepComparator(@NotNull Project project, @NotNull GitRepositoryManager manager, @NotNull VcsLogUi ui, @NotNull Disposable parent) { + myProject = project; + myRepositoryManager = manager; + myUi = ui; + Disposer.register(parent, this); + + myFilterChangeListener = new VcsLogFilterChangeListener() { + @Override + public void filtersPossiblyChanged() { + if (myTask == null) { // no task in progress => not interested in filter changes + return; + } + + VcsLogBranchFilter branchFilter = myUi.getFilterUi().getFilters().getBranchFilter(); + if (branchFilter == null || + branchFilter.getBranchNames().size() != 1 || + !branchFilter.getBranchNames().iterator().next().equals(myTask.myComparedBranch)) { + stopAndUnhighlight(); + } + } + }; + myUi.addFilterChangeListener(myFilterChangeListener); + + project.getMessageBus().connect(project).subscribe(VcsLogDataHolder.REFRESH_COMPLETED, new VcsLogRefreshListener() { + @Override + public void refresh(@NotNull DataPack dataPack) { + if (myTask == null) { // no task in progress => not interested in refresh events + return; + } + + // collect data + String comparedBranch = myTask.myComparedBranch; + Map<GitRepository, GitBranch> repositoriesWithCurrentBranches = myTask.myRepositoriesWithCurrentBranches; + VcsLogDataProvider provider = myTask.myProvider; + + stopAndUnhighlight(); + + // highlight again + Map<GitRepository, GitBranch> repositories = getRepositories(myUi.getDataPack().getLogProviders(), comparedBranch); + if (repositories.equals(repositoriesWithCurrentBranches)) { // but not if current branch changed + highlightInBackground(comparedBranch, provider); + } + } + }); + } + + public void highlightInBackground(@NotNull String branchToCompare, @NotNull VcsLogDataProvider dataProvider) { + if (myTask != null) { + LOG.error("Shouldn't be possible"); + return; + } + + Map<GitRepository, GitBranch> repositories = getRepositories(myUi.getDataPack().getLogProviders(), branchToCompare); + if (repositories.isEmpty()) { + return; + } + + myTask = new MyTask(myProject, myUi, repositories, dataProvider, branchToCompare); + myTask.queue(); + } + + @NotNull + private Map<GitRepository, GitBranch> getRepositories(@NotNull Map<VirtualFile, VcsLogProvider> providers, + @NotNull String branchToCompare) { + Map<GitRepository, GitBranch> repos = ContainerUtil.newHashMap(); + for (VirtualFile root : providers.keySet()) { + GitRepository repository = myRepositoryManager.getRepositoryForRoot(root); + if (repository == null || repository.getCurrentBranch() == null || + repository.getBranches().findBranchByName(branchToCompare) == null) { + continue; + } + repos.put(repository, repository.getCurrentBranch()); + } + return repos; + } + + public void stopAndUnhighlight() { + if (myTask != null) { + myTask.cancel(); + myTask = null; + } + if (myHighlighter != null) { + myUi.removeHighlighter(myHighlighter); + } + } + + @Override + public void dispose() { + stopAndUnhighlight(); + myUi.removeFilterChangeListener(myFilterChangeListener); + } + + public boolean hasHighlightingOrInProgress() { + return myTask != null; + } + + private class MyTask extends Task.Backgroundable { + + @NotNull private final Project myProject; + @NotNull private final VcsLogUi myUi; + @NotNull private final Map<GitRepository, GitBranch> myRepositoriesWithCurrentBranches; + @NotNull private final VcsLogDataProvider myProvider; + @NotNull private final String myComparedBranch; + + @NotNull private final TIntHashSet myNonPickedCommits = new TIntHashSet(); + @Nullable private VcsException myException; + private boolean myCancelled; + + public MyTask(@NotNull Project project, @NotNull VcsLogUi ui, @NotNull Map<GitRepository, GitBranch> repositoriesWithCurrentBranches, + @NotNull VcsLogDataProvider dataProvider, @NotNull String branchToCompare) { + super(project, "Comparing branches..."); + myProject = project; + myUi = ui; + myRepositoriesWithCurrentBranches = repositoriesWithCurrentBranches; + myProvider = dataProvider; + myComparedBranch = branchToCompare; + } + + @Override + public void run(@NotNull ProgressIndicator indicator) { + try { + for (Map.Entry<GitRepository, GitBranch> entry : myRepositoriesWithCurrentBranches.entrySet()) { + GitRepository repo = entry.getKey(); + GitBranch currentBranch = entry.getValue(); + myNonPickedCommits.addAll(getNonPickedCommitsFromGit(myProject, repo.getRoot(), myProvider, + currentBranch.getName(), myComparedBranch).toArray()); + } + } + catch (VcsException e) { + LOG.warn(e); + myException = e; + } + } + + @Override + public void onSuccess() { + if (myCancelled) { + return; + } + + if (myException != null) { + VcsNotifier.getInstance(myProject).notifyError("Couldn't compare with branch " + myComparedBranch, myException.getMessage()); + return; + } + + if (myHighlighter != null) { + myUi.removeHighlighter(myHighlighter); + } + myHighlighter = new VcsLogHighlighter() { + @Nullable + @Override + public Color getForeground(int commitIndex, boolean isSelected) { + return !myNonPickedCommits.contains(commitIndex) ? JBColor.GRAY : null; + } + }; + myUi.addHighlighter(myHighlighter); + } + + public void cancel() { + myCancelled = true; + } + + @NotNull + private TIntHashSet getNonPickedCommitsFromGit(@NotNull Project project, @NotNull VirtualFile root, + @NotNull final VcsLogDataProvider dataProvider, + @NotNull String currentBranch, @NotNull String comparedBranch) throws VcsException { + GitLineHandler handler = new GitLineHandler(project, root, GitCommand.CHERRY); + handler.addParameters(currentBranch, comparedBranch); // upstream - current branch; head - compared branch + + final TIntHashSet pickedCommits = new TIntHashSet(); + handler.addLineListener(new GitLineHandlerAdapter() { + @Override + public void onLineAvailable(String line, Key outputType) { + // + 645caac042ff7fb1a5e3f7d348f00e9ceea5c317 + // - c3b9b90f6c26affd7e597ebf65db96de8f7e5860 + if (line.startsWith("+")) { + try { + line = line.substring(2).trim(); + int firstSpace = line.indexOf(' '); + if (firstSpace > 0) { + line = line.substring(0, firstSpace); // safety-check: take just the first word for sure + } + Hash hash = HashImpl.build(line); + pickedCommits.add(dataProvider.getCommitIndex(hash)); + } + catch (Exception e) { + LOG.error("Couldn't parse line [" + line + "]"); + } + } + } + }); + handler.runInCurrentThread(null); + return pickedCommits; + } + + } + +} diff --git a/plugins/git4idea/src/git4idea/branch/DeepComparatorHolder.java b/plugins/git4idea/src/git4idea/branch/DeepComparatorHolder.java new file mode 100644 index 000000000000..fdab43700b50 --- /dev/null +++ b/plugins/git4idea/src/git4idea/branch/DeepComparatorHolder.java @@ -0,0 +1,59 @@ +/* + * Copyright 2000-2014 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 git4idea.branch; + +import com.intellij.openapi.Disposable; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Disposer; +import com.intellij.util.containers.ContainerUtil; +import com.intellij.vcs.log.VcsLogUi; +import git4idea.repo.GitRepositoryManager; +import org.jetbrains.annotations.NotNull; + +import java.util.Map; + +public class DeepComparatorHolder implements Disposable { + + @NotNull private final Project myProject; + @NotNull private final GitRepositoryManager myRepositoryManager; + + @NotNull private final Map<VcsLogUi, DeepComparator> myComparators; + + // initialized by pico-container + @SuppressWarnings("UnusedDeclaration") + private DeepComparatorHolder(@NotNull Project project, @NotNull GitRepositoryManager repositoryManager) { + myProject = project; + myRepositoryManager = repositoryManager; + myComparators = ContainerUtil.newHashMap(); + Disposer.register(project, this); + } + + @NotNull + public DeepComparator getInstance(@NotNull VcsLogUi ui) { + DeepComparator comparator = myComparators.get(ui); + if (comparator == null) { + comparator = new DeepComparator(myProject, myRepositoryManager, ui, this); + myComparators.put(ui, comparator); + } + return comparator; + } + + @Override + public void dispose() { + myComparators.clear(); + } + +} diff --git a/plugins/git4idea/src/git4idea/branch/DeepCompareAction.java b/plugins/git4idea/src/git4idea/branch/DeepCompareAction.java new file mode 100644 index 000000000000..52ccb25a0ce2 --- /dev/null +++ b/plugins/git4idea/src/git4idea/branch/DeepCompareAction.java @@ -0,0 +1,108 @@ +/* + * Copyright 2000-2014 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 git4idea.branch; + +import com.intellij.openapi.actionSystem.*; +import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.DumbAwareAction; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.ui.popup.JBPopupFactory; +import com.intellij.openapi.ui.popup.ListPopup; +import com.intellij.ui.awt.RelativePoint; +import com.intellij.util.Consumer; +import com.intellij.util.Function; +import com.intellij.vcs.log.*; +import com.intellij.vcs.log.data.VcsLogBranchFilterImpl; +import com.intellij.vcs.log.ui.filter.BranchFilterPopupComponent; +import org.jetbrains.annotations.NotNull; + +import java.awt.event.InputEvent; +import java.awt.event.MouseEvent; +import java.util.Collections; + +public class DeepCompareAction extends ToggleAction implements DumbAware { + + @Override + public boolean isSelected(AnActionEvent e) { + Project project = e.getData(CommonDataKeys.PROJECT); + VcsLogUi ui = e.getData(VcsLogDataKeys.VCS_LOG_UI); + if (project == null || ui == null) { + return false; + } + return DeepComparator.getInstance(project, ui).hasHighlightingOrInProgress(); + } + + @Override + public void setSelected(AnActionEvent e, boolean selected) { + Project project = e.getData(CommonDataKeys.PROJECT); + final VcsLogUi ui = e.getData(VcsLogDataKeys.VCS_LOG_UI); + final VcsLogDataProvider dataProvider = e.getData(VcsLogDataKeys.VCS_LOG_DATA_PROVIDER); + if (project == null || ui == null || dataProvider == null) { + return; + } + final DeepComparator dc = DeepComparator.getInstance(project, ui); + if (selected) { + VcsLogBranchFilter branchFilter = ui.getFilterUi().getFilters().getBranchFilter(); + if (branchFilter == null || branchFilter.getBranchNames().size() != 1) { + selectBranchAndPerformAction(ui.getDataPack(), e, new Consumer<String>() { + @Override + public void consume(String selectedBranch) { + ui.getFilterUi().setFilter(new VcsLogBranchFilterImpl(Collections.singleton(selectedBranch))); + dc.highlightInBackground(selectedBranch, dataProvider); + } + }); + return; + } + String branchToCompare = branchFilter.getBranchNames().iterator().next(); + dc.highlightInBackground(branchToCompare, dataProvider); + } + else { + dc.stopAndUnhighlight(); + } + } + + private static void selectBranchAndPerformAction(@NotNull VcsLogDataPack dataPack, @NotNull AnActionEvent event, + @NotNull final Consumer<String> consumer) { + ActionGroup actionGroup = BranchFilterPopupComponent.constructActionGroup(dataPack, null, new Function<String, AnAction>() { + @Override + public AnAction fun(final String s) { + return new DumbAwareAction(s) { + @Override + public void actionPerformed(AnActionEvent e) { + consumer.consume(s); + } + }; + } + }); + ListPopup popup = JBPopupFactory.getInstance().createActionGroupPopup("Select branch to compare", actionGroup, event.getDataContext(), + false, false, false, null, -1, null); + InputEvent inputEvent = event.getInputEvent(); + if (inputEvent instanceof MouseEvent) { + popup.show(new RelativePoint((MouseEvent)inputEvent)); + } + else { + popup.showInBestPositionFor(event.getDataContext()); + } + } + + @Override + public void update(AnActionEvent e) { + super.update(e); + VcsLogUi ui = e.getData(VcsLogDataKeys.VCS_LOG_UI); + e.getPresentation().setEnabledAndVisible(ui != null); + } + +} diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java index 9cc47791bca2..b65d4cc6097e 100644 --- a/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java @@ -15,7 +15,6 @@ */ package git4idea.branch; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; @@ -23,6 +22,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.Function; @@ -41,8 +41,6 @@ import static com.intellij.openapi.util.text.StringUtil.pluralize; /** * Common class for Git operations with branches aware of multi-root configuration, * which means showing combined error information, proposing to rollback, etc. - * - * @author Kirill Likhodedov */ abstract class GitBranchOperation { @@ -155,7 +153,7 @@ abstract class GitBranchOperation { } protected void notifySuccess(@NotNull String message) { - myUiHandler.notifySuccess(message); + VcsNotifier.getInstance(myProject).notifySuccess(message); } protected final void notifySuccess() { @@ -190,12 +188,7 @@ abstract class GitBranchOperation { } protected void notifyError(@NotNull String title, @NotNull String message) { - if (ApplicationManager.getApplication().isUnitTestMode()) { - throw new RuntimeException(title + ": " + message); - } - else { - myUiHandler.notifyError(title, message); - } + VcsNotifier.getInstance(myProject).notifyError(title, message); } @NotNull diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchUiHandler.java b/plugins/git4idea/src/git4idea/branch/GitBranchUiHandler.java index aa644146e5b0..9a153bb9dfed 100644 --- a/plugins/git4idea/src/git4idea/branch/GitBranchUiHandler.java +++ b/plugins/git4idea/src/git4idea/branch/GitBranchUiHandler.java @@ -15,7 +15,6 @@ */ package git4idea.branch; -import com.intellij.notification.NotificationListener; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.changes.Change; @@ -23,7 +22,6 @@ import com.intellij.openapi.vfs.VirtualFile; import git4idea.GitCommit; import git4idea.repo.GitRepository; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.Collection; import java.util.List; @@ -33,25 +31,12 @@ import java.util.Map; * <p>Handles UI interaction during various operations on branches: shows notifications, proposes to rollback, shows dialogs, messages, etc. * Some methods return the choice selected by user to the calling code, if it is needed.</p> * <p>The purpose of this class is to separate UI interaction from the main code, which would in particular simplify testing.</p> - * - * @author Kirill Likhodedov */ public interface GitBranchUiHandler { @NotNull ProgressIndicator getProgressIndicator(); - /** - * Shows a notification about successful branch operation. The title is empty. - */ - void notifySuccess(@NotNull String message); - - void notifySuccess(@NotNull String title, @NotNull String message); - - void notifySuccess(@NotNull String title, @NotNull String description, @Nullable NotificationListener listener); - - void notifyError(@NotNull String title, @NotNull String message); - boolean notifyErrorWithRollbackProposal(@NotNull String title, @NotNull String message, @NotNull String rollbackProposal); /** diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchUiHandlerImpl.java b/plugins/git4idea/src/git4idea/branch/GitBranchUiHandlerImpl.java index 0defd883244f..0c1878a5ec82 100644 --- a/plugins/git4idea/src/git4idea/branch/GitBranchUiHandlerImpl.java +++ b/plugins/git4idea/src/git4idea/branch/GitBranchUiHandlerImpl.java @@ -17,26 +17,27 @@ package git4idea.branch; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; -import com.intellij.notification.NotificationType; -import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.VerticalFlowLayout; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.ui.SelectFilesDialog; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.components.JBLabel; import com.intellij.util.ui.UIUtil; import com.intellij.xml.util.XmlStringUtil; -import git4idea.*; +import git4idea.GitCommit; +import git4idea.GitPlatformFacade; +import git4idea.GitUtil; +import git4idea.MessageManager; import git4idea.commands.Git; import git4idea.merge.GitConflictResolver; import git4idea.repo.GitRepository; import git4idea.util.UntrackedFilesNotifier; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.event.HyperlinkEvent; @@ -46,9 +47,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; -/** - * @author Kirill Likhodedov - */ public class GitBranchUiHandlerImpl implements GitBranchUiHandler { @NotNull private final Project myProject; @@ -64,26 +62,6 @@ public class GitBranchUiHandlerImpl implements GitBranchUiHandler { } @Override - public void notifySuccess(@NotNull String message) { - notifySuccess("", message); - } - - @Override - public void notifySuccess(@NotNull String title, @NotNull String message) { - notifySuccess(title, message, null); - } - - @Override - public void notifySuccess(@NotNull String title, @NotNull String description, @Nullable NotificationListener listener) { - Notificator.getInstance(myProject).notify(GitVcs.NOTIFICATION_GROUP_ID, title, description, NotificationType.INFORMATION, listener); - } - - @Override - public void notifyError(@NotNull String title, @NotNull String message) { - Notificator.getInstance(myProject).notify(GitVcs.IMPORTANT_ERROR_NOTIFICATION, title, message, NotificationType.ERROR); - } - - @Override public boolean notifyErrorWithRollbackProposal(@NotNull final String title, @NotNull final String message, @NotNull final String rollbackProposal) { final AtomicBoolean ok = new AtomicBoolean(); @@ -106,7 +84,7 @@ public class GitBranchUiHandlerImpl implements GitBranchUiHandler { public void showUnmergedFilesNotification(@NotNull final String operationName, @NotNull final Collection<GitRepository> repositories) { String title = unmergedFilesErrorTitle(operationName); String description = unmergedFilesErrorNotificationDescription(operationName); - Notificator.getInstance(myProject).notify(GitVcs.IMPORTANT_ERROR_NOTIFICATION, title, description, NotificationType.ERROR, + VcsNotifier.getInstance(myProject).notifyError(title, description, new NotificationListener() { @Override public void hyperlinkUpdate(@NotNull Notification notification, @@ -142,7 +120,7 @@ public class GitBranchUiHandlerImpl implements GitBranchUiHandler { @Override public void showUntrackedFilesNotification(@NotNull String operationName, @NotNull Collection<VirtualFile> untrackedFiles) { - UntrackedFilesNotifier.notifyUntrackedFilesOverwrittenBy(myProject, ServiceManager.getService(myProject, GitPlatformFacade.class), + UntrackedFilesNotifier.notifyUntrackedFilesOverwrittenBy(myProject, untrackedFiles, operationName, null); } diff --git a/plugins/git4idea/src/git4idea/branch/GitCheckoutNewBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitCheckoutNewBranchOperation.java index 942d4c050941..22e486e6eab0 100644 --- a/plugins/git4idea/src/git4idea/branch/GitCheckoutNewBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitCheckoutNewBranchOperation.java @@ -17,6 +17,7 @@ package git4idea.branch; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.vcs.VcsNotifier; import git4idea.GitPlatformFacade; import git4idea.commands.Git; import git4idea.commands.GitCommandResult; @@ -31,8 +32,6 @@ import static git4idea.util.GitUIUtil.code; /** * Create new branch (starting from the current branch) and check it out. - * - * @author Kirill Likhodedov */ class GitCheckoutNewBranchOperation extends GitBranchOperation { @@ -113,8 +112,9 @@ class GitCheckoutNewBranchOperation extends GitBranchOperation { refresh(repository); } if (checkoutResult.totalSuccess() && deleteResult.totalSuccess()) { - myUiHandler.notifySuccess("Rollback successful", String.format("Checked out %s and deleted %s on %s %s", code(myCurrentBranchOrRev), code(myNewBranchName), - StringUtil.pluralize("root", repositories.size()), successfulRepositoriesJoined())); + VcsNotifier.getInstance(myProject).notifySuccess("Rollback successful", String + .format("Checked out %s and deleted %s on %s %s", code(myCurrentBranchOrRev), code(myNewBranchName), + StringUtil.pluralize("root", repositories.size()), successfulRepositoriesJoined())); } else { StringBuilder message = new StringBuilder(); @@ -126,7 +126,7 @@ class GitCheckoutNewBranchOperation extends GitBranchOperation { message.append("Errors during deleting ").append(code(myNewBranchName)); message.append(deleteResult.getErrorOutputWithReposIndication()); } - myUiHandler.notifyError("Error during rollback", message.toString()); + VcsNotifier.getInstance(myProject).notifyError("Error during rollback", message.toString()); } } diff --git a/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java b/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java index a38ce8ae9b47..a48582680fa0 100644 --- a/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java @@ -15,19 +15,17 @@ */ package git4idea.branch; -import com.intellij.notification.NotificationType; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ArrayUtil; import git4idea.GitPlatformFacade; -import git4idea.GitVcs; import git4idea.commands.*; import git4idea.repo.GitRepository; import git4idea.util.GitPreservingProcess; -import git4idea.util.GitUIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -184,8 +182,8 @@ class GitCheckoutOperation extends GitBranchOperation { message.append("Errors during deleting ").append(code(myNewBranch)).append(": "); message.append(deleteResult.getErrorOutputWithReposIndication()); } - GitUIUtil.notify(GitVcs.IMPORTANT_ERROR_NOTIFICATION, myProject, "Error during rollback", - message.toString(), NotificationType.ERROR, null); + VcsNotifier.getInstance(myProject).notifyError("Error during rollback", + message.toString()); } } diff --git a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java index 68e17a9d1af1..d3501caf7089 100644 --- a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java @@ -15,18 +15,16 @@ */ package git4idea.branch; -import com.intellij.notification.NotificationType; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; import git4idea.GitCommit; import git4idea.GitPlatformFacade; -import git4idea.GitVcs; import git4idea.commands.*; import git4idea.repo.GitRepository; -import git4idea.util.GitUIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -121,8 +119,8 @@ class GitDeleteBranchOperation extends GitBranchOperation { } if (!result.totalSuccess()) { - GitUIUtil.notify(GitVcs.IMPORTANT_ERROR_NOTIFICATION, myProject, "Error during rollback of branch deletion", - result.getErrorOutputWithReposIndication(), NotificationType.ERROR, null); + VcsNotifier.getInstance(myProject).notifyError("Error during rollback of branch deletion", + result.getErrorOutputWithReposIndication()); } } diff --git a/plugins/git4idea/src/git4idea/branch/GitDeleteRemoteBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitDeleteRemoteBranchOperation.java index 29f7bd7f5c99..e1906592233d 100644 --- a/plugins/git4idea/src/git4idea/branch/GitDeleteRemoteBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitDeleteRemoteBranchOperation.java @@ -15,18 +15,16 @@ */ package git4idea.branch; -import com.intellij.notification.NotificationType; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.MessageDialogBuilder; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.util.ui.UIUtil; import git4idea.GitBranch; import git4idea.GitPlatformFacade; -import git4idea.GitVcs; -import git4idea.Notificator; import git4idea.commands.Git; import git4idea.commands.GitCommandResult; import git4idea.commands.GitCompoundResult; @@ -45,9 +43,6 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -/** - * @author Kirill Likhodedov - */ class GitDeleteRemoteBranchOperation extends GitBranchOperation { private final String myBranchName; @@ -140,8 +135,8 @@ class GitDeleteRemoteBranchOperation extends GitBranchOperation { repository.update(); } if (!result.totalSuccess()) { - Notificator.getInstance(myProject).notifyError("Failed to delete remote branch " + branchName, - result.getErrorOutputWithReposIndication()); + VcsNotifier.getInstance(myProject).notifyError("Failed to delete remote branch " + branchName, + result.getErrorOutputWithReposIndication()); } return result.totalSuccess(); } @@ -210,8 +205,8 @@ class GitDeleteRemoteBranchOperation extends GitBranchOperation { if (!localBranches.isEmpty()) { message = "Also deleted local " + StringUtil.pluralize("branch", localBranches.size()) + ": " + StringUtil.join(localBranches, ", "); } - Notificator.getInstance(myProject).notify(GitVcs.NOTIFICATION_GROUP_ID, "Deleted remote branch " + remoteBranchName, - message, NotificationType.INFORMATION); + VcsNotifier.getInstance(myProject).notifySuccess("Deleted remote branch " + remoteBranchName, + message); } private DeleteRemoteBranchDecision confirmBranchDeletion(@NotNull String branchName, @NotNull Collection<String> trackingBranches, diff --git a/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java b/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java index 43c325fe0886..81e5cc35f750 100644 --- a/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java @@ -18,20 +18,18 @@ package git4idea.branch; import com.intellij.dvcs.DvcsUtil; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; -import com.intellij.notification.NotificationType; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Pair; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ui.UIUtil; import git4idea.GitPlatformFacade; import git4idea.GitUtil; -import git4idea.GitVcs; -import git4idea.Notificator; import git4idea.commands.*; import git4idea.merge.GitMergeCommittingConflictResolver; import git4idea.merge.GitMerger; @@ -43,9 +41,6 @@ import javax.swing.event.HyperlinkEvent; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; -/** - * @author Kirill Likhodedov - */ class GitMergeOperation extends GitBranchOperation { private static final Logger LOG = Logger.getInstance(GitMergeOperation.class); @@ -170,7 +165,7 @@ class GitMergeOperation extends GitBranchOperation { break; case PROPOSE: String description = message + "<br/><a href='delete'>Delete " + myBranchToMerge + "</a>"; - myUiHandler.notifySuccess("", description, new DeleteMergedLocalBranchNotificationListener()); + VcsNotifier.getInstance(myProject).notifySuccess("", description, new DeleteMergedLocalBranchNotificationListener()); break; case NOTHING: super.notifySuccess(message); @@ -295,7 +290,7 @@ class GitMergeOperation extends GitBranchOperation { myConflictedRepositories.clear(); if (!result.totalSuccess()) { - Notificator.getInstance(myProject).notifyError("Error during rollback", result.getErrorOutputWithReposIndication()); + VcsNotifier.getInstance(myProject).notifyError("Error during rollback", result.getErrorOutputWithReposIndication()); } LOG.info("rollback finished."); } @@ -369,10 +364,9 @@ class GitMergeOperation extends GitBranchOperation { @Override protected void notifyUnresolvedRemain() { - Notificator.getInstance(myProject).notify( - GitVcs.IMPORTANT_ERROR_NOTIFICATION, "Merged branch " + myBranchToMerge + " with conflicts", - "Unresolved conflicts remain in the project. <a href='resolve'>Resolve now.</a>", NotificationType.WARNING, - getResolveLinkListener()); + VcsNotifier.getInstance(myProject).notifyImportantWarning("Merged branch " + myBranchToMerge + " with conflicts", + "Unresolved conflicts remain in the project. <a href='resolve'>Resolve now.</a>", + getResolveLinkListener()); } } diff --git a/plugins/git4idea/src/git4idea/checkout/GitCheckoutProvider.java b/plugins/git4idea/src/git4idea/checkout/GitCheckoutProvider.java index 9b3e587ef3bb..a8b78a151423 100644 --- a/plugins/git4idea/src/git4idea/checkout/GitCheckoutProvider.java +++ b/plugins/git4idea/src/git4idea/checkout/GitCheckoutProvider.java @@ -20,11 +20,11 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.Task; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.CheckoutProvider; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import git4idea.GitVcs; -import git4idea.Notificator; import git4idea.actions.BasicAction; import git4idea.commands.Git; import git4idea.commands.GitCommandResult; @@ -127,7 +127,7 @@ public class GitCheckoutProvider implements CheckoutProvider { if (result.success()) { return true; } - Notificator.getInstance(project).notifyError("Clone failed", result.getErrorOutputAsHtmlString()); + VcsNotifier.getInstance(project).notifyError("Clone failed", result.getErrorOutputAsHtmlString()); return false; } diff --git a/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java b/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java index 4c288c5701f6..a19ea0726201 100644 --- a/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java +++ b/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java @@ -21,6 +21,7 @@ import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.FilePath; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.changes.*; import com.intellij.openapi.vcs.history.VcsRevisionNumber; import com.intellij.openapi.vcs.merge.MergeDialogCustomizer; @@ -136,7 +137,7 @@ public class GitCherryPicker { "Please move, remove or add them before you can cherry-pick. <a href='view'>View them</a>"; description += getSuccessfulCommitDetailsIfAny(successfulCommits); - UntrackedFilesNotifier.notifyUntrackedFilesOverwrittenBy(myProject, myPlatformFacade, untrackedFilesDetector.getFiles(), + UntrackedFilesNotifier.notifyUntrackedFilesOverwrittenBy(myProject, untrackedFilesDetector.getFiles(), "cherry-pick", description); return false; } @@ -182,7 +183,7 @@ public class GitCherryPicker { String description = commitDetails(commit) + "<br/>Unresolved conflicts remain in the working tree. <a href='resolve'>Resolve them.<a/>"; description += getSuccessfulCommitDetailsIfAny(successfulCommits); - myPlatformFacade.getNotificator(myProject).notifyStrongWarning("Cherry-picked with conflicts", description, resolveLinkListener); + VcsNotifier.getInstance(myProject).notifyImportantWarning("Cherry-picked with conflicts", description, resolveLinkListener); } private void notifyCommitCancelled(@NotNull GitCommitWrapper commit, @NotNull List<GitCommitWrapper> successfulCommits) { @@ -192,7 +193,7 @@ public class GitCherryPicker { } String description = commitDetails(commit); description += getSuccessfulCommitDetailsIfAny(successfulCommits); - myPlatformFacade.getNotificator(myProject).notifyWeakWarning("Cherry-pick cancelled", description, null); + VcsNotifier.getInstance(myProject).notifyMinorWarning("Cherry-pick cancelled", description, null); } private CherryPickData updateChangeListManager(@NotNull final VcsFullCommitDetails commit) { @@ -317,10 +318,12 @@ public class GitCherryPicker { } } - private void notifyError(@NotNull String content, @NotNull GitCommitWrapper failedCommit, @NotNull List<GitCommitWrapper> successfulCommits) { + private void notifyError(@NotNull String content, + @NotNull GitCommitWrapper failedCommit, + @NotNull List<GitCommitWrapper> successfulCommits) { String description = commitDetails(failedCommit) + "<br/>" + content; description += getSuccessfulCommitDetailsIfAny(successfulCommits); - myPlatformFacade.getNotificator(myProject).notifyError("Cherry-pick failed", description); + VcsNotifier.getInstance(myProject).notifyError("Cherry-pick failed", description); } @NotNull @@ -335,7 +338,7 @@ public class GitCherryPicker { private void notifySuccess(@NotNull List<GitCommitWrapper> successfulCommits) { String description = getCommitsDetails(successfulCommits); - myPlatformFacade.getNotificator(myProject).notifySuccess("Cherry-pick successful", description); + VcsNotifier.getInstance(myProject).notifySuccess("Cherry-pick successful", description); } @NotNull diff --git a/plugins/git4idea/src/git4idea/commands/GitCommand.java b/plugins/git4idea/src/git4idea/commands/GitCommand.java index 226d663beb1f..27beb50100c1 100644 --- a/plugins/git4idea/src/git4idea/commands/GitCommand.java +++ b/plugins/git4idea/src/git4idea/commands/GitCommand.java @@ -41,6 +41,7 @@ public class GitCommand { public static final GitCommand CHECK_ATTR = read("check-attr"); public static final GitCommand COMMIT = write("commit"); public static final GitCommand CONFIG = read("config"); + public static final GitCommand CHERRY = read("cherry"); public static final GitCommand CHERRY_PICK = write("cherry-pick"); public static final GitCommand CLONE = write("clone"); public static final GitCommand DIFF = read("diff"); diff --git a/plugins/git4idea/src/git4idea/commands/GitTaskResultNotificationHandler.java b/plugins/git4idea/src/git4idea/commands/GitTaskResultNotificationHandler.java index 081a3e31283d..9684f6c92e7d 100644 --- a/plugins/git4idea/src/git4idea/commands/GitTaskResultNotificationHandler.java +++ b/plugins/git4idea/src/git4idea/commands/GitTaskResultNotificationHandler.java @@ -15,13 +15,9 @@ */ package git4idea.commands; -import com.intellij.notification.NotificationType; import com.intellij.openapi.project.Project; -import git4idea.GitVcs; +import com.intellij.openapi.vcs.VcsNotifier; -/** - * @author Kirill Likhodedov - */ public class GitTaskResultNotificationHandler extends GitTaskResultHandlerAdapter { private final Project myProject; private final String mySuccessMessage; @@ -35,15 +31,18 @@ public class GitTaskResultNotificationHandler extends GitTaskResultHandlerAdapte myErrorMessage = errorMessage; } - @Override protected void onSuccess() { - GitVcs.NOTIFICATION_GROUP_ID.createNotification(mySuccessMessage, NotificationType.INFORMATION).notify(myProject); + @Override + protected void onSuccess() { + VcsNotifier.getInstance(myProject).notifySuccess(mySuccessMessage); } - @Override protected void onCancel() { - GitVcs.NOTIFICATION_GROUP_ID.createNotification(myCancelMessage, NotificationType.INFORMATION).notify(myProject); + @Override + protected void onCancel() { + VcsNotifier.getInstance(myProject).notifySuccess(myCancelMessage); } - @Override protected void onFailure() { - GitVcs.IMPORTANT_ERROR_NOTIFICATION.createNotification(myErrorMessage, NotificationType.ERROR).notify(myProject); + @Override + protected void onFailure() { + VcsNotifier.getInstance(myProject).notifyError("", myErrorMessage); } } diff --git a/plugins/git4idea/src/git4idea/history/GitChangesParser.java b/plugins/git4idea/src/git4idea/history/GitChangesParser.java new file mode 100644 index 000000000000..8dc85a31d131 --- /dev/null +++ b/plugins/git4idea/src/git4idea/history/GitChangesParser.java @@ -0,0 +1,119 @@ +/* + * Copyright 2000-2014 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 git4idea.history; + +import com.intellij.openapi.project.Project; +import com.intellij.openapi.vcs.FilePath; +import com.intellij.openapi.vcs.FileStatus; +import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.changes.Change; +import com.intellij.openapi.vcs.changes.ContentRevision; +import com.intellij.openapi.vcs.history.VcsRevisionNumber; +import com.intellij.openapi.vfs.VirtualFile; +import git4idea.GitContentRevision; +import git4idea.GitRevisionNumber; +import git4idea.history.wholeTree.AbstractHash; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class GitChangesParser { + + @NotNull + public static List<Change> parse(@NotNull Project project, + @NotNull VirtualFile root, + @NotNull List<GitLogStatusInfo> statusInfos, + @NotNull String hash, + @NotNull Date date, + @NotNull List<String> parentsHashes) throws VcsException { + GitRevisionNumber thisRevision = new GitRevisionNumber(hash, date); + List<GitRevisionNumber> parentRevisions = prepareParentRevisions(parentsHashes); + + List<Change> result = new ArrayList<Change>(); + for (GitLogStatusInfo statusInfo : statusInfos) { + result.add(parseChange(project, root, parentRevisions, statusInfo, thisRevision)); + } + return result; + } + + private static List<GitRevisionNumber> prepareParentRevisions(List<String> parentsHashes) { + final List<AbstractHash> parents = new ArrayList<AbstractHash>(parentsHashes.size()); + for (String parentsShortHash : parentsHashes) { + parents.add(AbstractHash.create(parentsShortHash)); + } + + final List<GitRevisionNumber> parentRevisions = new ArrayList<GitRevisionNumber>(parents.size()); + for (AbstractHash parent : parents) { + parentRevisions.add(new GitRevisionNumber(parent.getString())); + } + return parentRevisions; + } + + private static Change parseChange(final Project project, final VirtualFile vcsRoot, final List<GitRevisionNumber> parentRevisions, + final GitLogStatusInfo statusInfo, final VcsRevisionNumber thisRevision) throws VcsException { + final ContentRevision before; + final ContentRevision after; + FileStatus status = null; + final String path = statusInfo.getFirstPath(); + @Nullable GitRevisionNumber firstParent = parentRevisions.isEmpty() ? null : parentRevisions.get(0); + + switch (statusInfo.getType()) { + case ADDED: + before = null; + status = FileStatus.ADDED; + after = GitContentRevision.createRevision(vcsRoot, path, thisRevision, project, false, false, true); + break; + case UNRESOLVED: + status = FileStatus.MERGED_WITH_CONFLICTS; + case MODIFIED: + if (status == null) { + status = FileStatus.MODIFIED; + } + final FilePath filePath = GitContentRevision.createPath(vcsRoot, path, false, true, true); + before = GitContentRevision.createRevision(vcsRoot, path, firstParent, project, false, false, true); + after = GitContentRevision.createRevision(filePath, thisRevision, project, null); + break; + case DELETED: + status = FileStatus.DELETED; + final FilePath filePathDeleted = GitContentRevision.createPath(vcsRoot, path, true, true, true); + before = GitContentRevision.createRevision(filePathDeleted, firstParent, project, null); + after = null; + break; + case COPIED: + case RENAMED: + status = FileStatus.MODIFIED; + String secondPath = statusInfo.getSecondPath(); + final FilePath filePathAfterRename = GitContentRevision.createPath(vcsRoot, secondPath == null ? path : secondPath, + false, false, true); + before = GitContentRevision.createRevision(vcsRoot, path, firstParent, project, true, true, true); + after = GitContentRevision.createRevision(filePathAfterRename, thisRevision, project, null); + break; + case TYPE_CHANGED: + status = FileStatus.MODIFIED; + final FilePath filePath2 = GitContentRevision.createPath(vcsRoot, path, false, true, true); + before = GitContentRevision.createRevision(vcsRoot, path, firstParent, project, false, false, true); + after = GitContentRevision.createRevision(filePath2, thisRevision, project, null); + break; + default: + throw new AssertionError("Unknown file status: " + statusInfo); + } + return new Change(before, after, status); + } + +} diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java index f4cc163da2e3..6b68987a1111 100644 --- a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java +++ b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java @@ -16,6 +16,7 @@ package git4idea.history; import com.intellij.execution.process.ProcessOutputTypes; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProcessCanceledException; @@ -42,6 +43,7 @@ import com.intellij.util.concurrency.Semaphore; import com.intellij.util.containers.ContainerUtil; import com.intellij.vcs.log.*; import com.intellij.vcs.log.impl.HashImpl; +import com.intellij.vcs.log.util.StopWatch; import git4idea.*; import git4idea.branch.GitBranchUtil; import git4idea.commands.*; @@ -486,6 +488,11 @@ public class GitHistoryUtils { } public static List<? extends VcsShortCommitDetails> readMiniDetails(final Project project, final VirtualFile root, List<String> hashes) throws VcsException { + final VcsLogObjectsFactory factory = getObjectsFactoryWithDisposeCheck(project); + if (factory == null) { + return Collections.emptyList(); + } + GitSimpleHandler h = new GitSimpleHandler(project, root, GitCommand.LOG); GitLogParser parser = new GitLogParser(project, GitLogParser.NameStatus.NONE, HASH, PARENTS, AUTHOR_NAME, AUTHOR_EMAIL, COMMIT_TIME, SUBJECT); @@ -505,26 +512,31 @@ public class GitHistoryUtils { for (String parent : record.getParentsHashes()) { parents.add(HashImpl.build(parent)); } - return vcsObjectsFactory(project).createShortDetails(HashImpl.build(record.getHash()), parents, record.getCommitTime(), root, - record.getSubject(), record.getAuthorName(), record.getAuthorEmail()); + return factory.createShortDetails(HashImpl.build(record.getHash()), parents, record.getCommitTime(), root, + record.getSubject(), record.getAuthorName(), record.getAuthorEmail()); } }); } @NotNull - public static List<TimedVcsCommit> readAllHashes(@NotNull final Project project, - @NotNull VirtualFile root, - @NotNull final Consumer<VcsUser> userRegistry) throws VcsException { - final int COMMIT_BUFFER = 1000; + public static List<TimedVcsCommit> readCommits(@NotNull final Project project, + @NotNull VirtualFile root, + @NotNull final Consumer<VcsUser> userRegistry, + @NotNull List<String> parameters) throws VcsException { + final VcsLogObjectsFactory factory = getObjectsFactoryWithDisposeCheck(project); + if (factory == null) { + return Collections.emptyList(); + } + final int COMMIT_BUFFER = 1000; GitLineHandler h = new GitLineHandler(project, root, GitCommand.LOG); final GitLogParser parser = new GitLogParser(project, GitLogParser.NameStatus.NONE, HASH, PARENTS, COMMIT_TIME, AUTHOR_NAME, AUTHOR_EMAIL); h.setStdoutSuppressed(true); h.addParameters(parser.getPretty(), "--encoding=UTF-8"); - h.addParameters(LOG_ALL); h.addParameters("--full-history", "--sparse"); h.addParameters("--date-order"); + h.addParameters(parameters); h.endOptions(); final List<TimedVcsCommit> commits = ContainerUtil.newArrayList(); @@ -551,7 +563,7 @@ public class GitHistoryUtils { afterParseRemainder = line.substring(recordEnd + 1); } if (afterParseRemainder != null && records.incrementAndGet() > COMMIT_BUFFER) { // null means can't parse now - commits.addAll(parseCommit(project, parser, record, userRegistry)); + commits.addAll(parseCommit(parser, record, userRegistry, factory)); record.setLength(0); record.append(afterParseRemainder); } @@ -564,7 +576,7 @@ public class GitHistoryUtils { @Override public void processTerminated(int exitCode) { try { - commits.addAll(parseCommit(project, parser, record, userRegistry)); + commits.addAll(parseCommit(parser, record, userRegistry, factory)); } catch (Exception e) { ex.set(new VcsException(e)); @@ -583,8 +595,10 @@ public class GitHistoryUtils { return commits; } - private static List<TimedVcsCommit> parseCommit(final Project project, GitLogParser parser, StringBuilder record, - final Consumer<VcsUser> userRegistry) { + @NotNull + private static List<TimedVcsCommit> parseCommit(@NotNull GitLogParser parser, @NotNull StringBuilder record, + @NotNull final Consumer<VcsUser> userRegistry, + @NotNull final VcsLogObjectsFactory factory) { List<GitLogRecord> rec = parser.parse(record.toString()); return ContainerUtil.mapNotNull(rec, new Function<GitLogRecord, TimedVcsCommit>() { @Override @@ -592,16 +606,15 @@ public class GitHistoryUtils { if (record == null) { return null; } - TimedVcsCommit commit = convert(project, record); - userRegistry.consume(vcsObjectsFactory(project).createUser(record.getAuthorName(), record.getAuthorEmail())); + TimedVcsCommit commit = convert(record, factory); + userRegistry.consume(factory.createUser(record.getAuthorName(), record.getAuthorEmail())); return commit; } }); } @NotNull - private static TimedVcsCommit convert(Project project, GitLogRecord rec) { - VcsLogObjectsFactory factory = vcsObjectsFactory(project); + private static TimedVcsCommit convert(@NotNull GitLogRecord rec, @NotNull VcsLogObjectsFactory factory) { List<Hash> parents = ContainerUtil.map(rec.getParentsHashes(), new Function<String, Hash>() { @Override public Hash fun(String s) { @@ -611,9 +624,17 @@ public class GitHistoryUtils { return factory.createTimedCommit(HashImpl.build(rec.getHash()), parents, rec.getCommitTime()); } - @NotNull - private static VcsLogObjectsFactory vcsObjectsFactory(@NotNull Project project) { - return ServiceManager.getService(project, VcsLogObjectsFactory.class); + @Nullable + private static VcsLogObjectsFactory getObjectsFactoryWithDisposeCheck(@NotNull final Project project) { + return ApplicationManager.getApplication().runReadAction(new Computable<VcsLogObjectsFactory>() { + @Override + public VcsLogObjectsFactory compute() { + if (!project.isDisposed()) { + return ServiceManager.getService(project, VcsLogObjectsFactory.class); + } + return null; + } + }); } private static class MyTokenAccumulator { @@ -731,6 +752,11 @@ public class GitHistoryUtils { @NotNull public static List<GitCommit> history(@NotNull final Project project, @NotNull final VirtualFile root, String... parameters) throws VcsException { + final VcsLogObjectsFactory factory = getObjectsFactoryWithDisposeCheck(project); + if (factory == null) { + return Collections.emptyList(); + } + GitSimpleHandler h = new GitSimpleHandler(project, root, GitCommand.LOG); GitLogParser parser = new GitLogParser(project, GitLogParser.NameStatus.STATUS, HASH, COMMIT_TIME, AUTHOR_NAME, AUTHOR_TIME, AUTHOR_EMAIL, COMMITTER_NAME, COMMITTER_EMAIL, PARENTS, SUBJECT, BODY, RAW_BODY); @@ -740,15 +766,20 @@ public class GitHistoryUtils { h.addParameters("--full-history", "--sparse"); h.endOptions(); + StopWatch sw = StopWatch.start("git log --all-details"); String output = h.run(); + sw.report(); + sw = StopWatch.start("parsing"); List<GitLogRecord> records = parser.parse(output); + sw.report(); - return ContainerUtil.mapNotNull(records, new Function<GitLogRecord, GitCommit>() { + sw = StopWatch.start("Creating GitCommit objects"); + List<GitCommit> gitCommits = ContainerUtil.mapNotNull(records, new Function<GitLogRecord, GitCommit>() { @Override public GitCommit fun(GitLogRecord record) { try { - return createCommit(project, root, record); + return createCommit(project, root, record, factory); } catch (VcsException e) { LOG.error(e); @@ -756,21 +787,22 @@ public class GitHistoryUtils { } } }); + sw.report(); + return gitCommits; } - private static GitCommit createCommit(@NotNull Project project, @NotNull VirtualFile root, @NotNull GitLogRecord record) - throws VcsException { + private static GitCommit createCommit(@NotNull Project project, @NotNull VirtualFile root, @NotNull GitLogRecord record, + @NotNull VcsLogObjectsFactory factory) throws VcsException { List<Hash> parents = ContainerUtil.map(record.getParentsHashes(), new Function<String, Hash>() { @Override public Hash fun(String hash) { return HashImpl.build(hash); } }); - VcsLogObjectsFactory factory = vcsObjectsFactory(project); return new GitCommit(project, HashImpl.build(record.getHash()), parents, record.getCommitTime(), root, record.getSubject(), factory.createUser(record.getAuthorName(), record.getAuthorEmail()), record.getFullMessage(), factory.createUser(record.getCommitterName(), record.getCommitterEmail()), record.getAuthorTimeStamp(), - record.parseChanges(project, root)); + record.getStatusInfos()); } /** @@ -1031,6 +1063,11 @@ public class GitHistoryUtils { @NotNull public static List<GitCommit> getAllDetails(@NotNull Project project, @NotNull VirtualFile root, @NotNull List<String> parameters) throws VcsException { + VcsLogObjectsFactory factory = getObjectsFactoryWithDisposeCheck(project); + if (factory == null) { + return Collections.emptyList(); + } + GitSimpleHandler h = new GitSimpleHandler(project, root, GitCommand.LOG); GitLogParser parser = new GitLogParser(project, GitLogParser.NameStatus.STATUS, HASH, HASH, COMMIT_TIME, AUTHOR_NAME, AUTHOR_TIME, AUTHOR_EMAIL, COMMITTER_NAME, @@ -1042,7 +1079,7 @@ public class GitHistoryUtils { String output = h.run(); final List<GitCommit> rc = new ArrayList<GitCommit>(); for (GitLogRecord record : parser.parse(output)) { - rc.add(createCommit(project, root, record)); + rc.add(createCommit(project, root, record, factory)); } return rc; } diff --git a/plugins/git4idea/src/git4idea/history/GitLogRecord.java b/plugins/git4idea/src/git4idea/history/GitLogRecord.java index 6dcaace1aeba..ff0ff817e3bb 100644 --- a/plugins/git4idea/src/git4idea/history/GitLogRecord.java +++ b/plugins/git4idea/src/git4idea/history/GitLogRecord.java @@ -17,21 +17,14 @@ package git4idea.history; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.FilePath; -import com.intellij.openapi.vcs.FileStatus; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.changes.Change; -import com.intellij.openapi.vcs.changes.ContentRevision; -import com.intellij.openapi.vcs.history.VcsRevisionNumber; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ArrayUtil; import com.intellij.vcsUtil.VcsUtil; -import git4idea.GitContentRevision; -import git4idea.GitRevisionNumber; import git4idea.GitUtil; import git4idea.commands.GitHandler; -import git4idea.history.wholeTree.AbstractHash; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.*; @@ -173,80 +166,7 @@ class GitLogRecord { } public List<Change> parseChanges(Project project, VirtualFile vcsRoot) throws VcsException { - GitRevisionNumber thisRevision = new GitRevisionNumber(getHash(), getDate()); - List<GitRevisionNumber> parentRevisions = prepareParentRevisions(); - - List<Change> result = new ArrayList<Change>(); - for (GitLogStatusInfo statusInfo: myStatusInfo) { - result.add(parseChange(project, vcsRoot, parentRevisions, statusInfo, thisRevision)); - } - return result; - } - - private List<GitRevisionNumber> prepareParentRevisions() { - final String[] parentsHashes = getParentsHashes(); - final List<AbstractHash> parents = new ArrayList<AbstractHash>(parentsHashes.length); - for (String parentsShortHash : parentsHashes) { - parents.add(AbstractHash.create(parentsShortHash)); - } - - final List<GitRevisionNumber> parentRevisions = new ArrayList<GitRevisionNumber>(parents.size()); - for (AbstractHash parent : parents) { - parentRevisions.add(new GitRevisionNumber(parent.getString())); - } - return parentRevisions; - } - - private static Change parseChange(final Project project, final VirtualFile vcsRoot, final List<GitRevisionNumber> parentRevisions, - final GitLogStatusInfo statusInfo, final VcsRevisionNumber thisRevision) throws VcsException { - final ContentRevision before; - final ContentRevision after; - FileStatus status = null; - final String path = statusInfo.getFirstPath(); - @Nullable GitRevisionNumber firstParent = parentRevisions.isEmpty() ? null : parentRevisions.get(0); - - switch (statusInfo.getType()) { - case ADDED: - before = null; - status = FileStatus.ADDED; - after = GitContentRevision.createRevision(vcsRoot, path, thisRevision, project, false, false, true); - break; - case UNRESOLVED: - status = FileStatus.MERGED_WITH_CONFLICTS; - case MODIFIED: - if (status == null) { - status = FileStatus.MODIFIED; - } - final FilePath filePath = GitContentRevision.createPath(vcsRoot, path, false, true, true); - before = GitContentRevision.createRevision(vcsRoot, path, firstParent, project, false, false, true); - after = GitContentRevision.createMultipleParentsRevision(project, filePath, (GitRevisionNumber)thisRevision, parentRevisions); - break; - case DELETED: - status = FileStatus.DELETED; - final FilePath filePathDeleted = GitContentRevision.createPath(vcsRoot, path, true, true, true); - before = GitContentRevision.createRevision(filePathDeleted, firstParent, project, null); - after = null; - break; - case COPIED: - case RENAMED: - status = FileStatus.MODIFIED; - String secondPath = statusInfo.getSecondPath(); - final FilePath filePathAfterRename = GitContentRevision.createPath(vcsRoot, secondPath == null ? path : secondPath, - false, false, true); - before = GitContentRevision.createRevision(vcsRoot, path, firstParent, project, true, true, true); - after = GitContentRevision.createMultipleParentsRevision(project, filePathAfterRename, - (GitRevisionNumber)thisRevision, parentRevisions); - break; - case TYPE_CHANGED: - status = FileStatus.MODIFIED; - final FilePath filePath2 = GitContentRevision.createPath(vcsRoot, path, false, true, true); - before = GitContentRevision.createRevision(vcsRoot, path, firstParent, project, false, false, true); - after = GitContentRevision.createMultipleParentsRevision(project, filePath2, (GitRevisionNumber)thisRevision, parentRevisions); - break; - default: - throw new AssertionError("Unknown file status: " + statusInfo); - } - return new Change(before, after, status); + return GitChangesParser.parse(project, vcsRoot, myStatusInfo, getHash(), getDate(), Arrays.asList(getParentsHashes())); } /** diff --git a/plugins/git4idea/src/git4idea/history/GitLogStatusInfo.java b/plugins/git4idea/src/git4idea/history/GitLogStatusInfo.java index 3b31696a49b0..ec3fb1dc9bac 100644 --- a/plugins/git4idea/src/git4idea/history/GitLogStatusInfo.java +++ b/plugins/git4idea/src/git4idea/history/GitLogStatusInfo.java @@ -20,10 +20,8 @@ import org.jetbrains.annotations.Nullable; /** * Information about a single file change as returned by {@code git log status --name-status}. - * - * @author Kirill Likhodedov */ -class GitLogStatusInfo { +public class GitLogStatusInfo { private final GitChangeType myType; private final String myPath; diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/GitBinaryMultipleContentsRevision.java b/plugins/git4idea/src/git4idea/history/wholeTree/GitBinaryMultipleContentsRevision.java deleted file mode 100644 index 644092498a28..000000000000 --- a/plugins/git4idea/src/git4idea/history/wholeTree/GitBinaryMultipleContentsRevision.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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. - */ -package git4idea.history.wholeTree; - -import com.intellij.openapi.vcs.FilePath; -import com.intellij.openapi.vcs.VcsException; -import com.intellij.openapi.vcs.changes.BinaryContentRevision; -import git4idea.GitBinaryContentRevision; -import git4idea.GitRevisionNumber; - -import java.util.List; - -/** - * @author irengrig - * Date: 12/20/10 - * Time: 3:03 PM - */ -public class GitBinaryMultipleContentsRevision extends GitMultipleContentsRevision implements BinaryContentRevision { - public GitBinaryMultipleContentsRevision(FilePath path, List<GitRevisionNumber> list, GitBinaryContentRevision contentRevision) - throws VcsException { - super(path, list, contentRevision); - } - - @Override - public byte[] getBinaryContent() throws VcsException { - return ((GitBinaryContentRevision) myRevision).getBinaryContent(); - } -} diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/GitMultipleContentsRevision.java b/plugins/git4idea/src/git4idea/history/wholeTree/GitMultipleContentsRevision.java deleted file mode 100644 index 58b29875f99d..000000000000 --- a/plugins/git4idea/src/git4idea/history/wholeTree/GitMultipleContentsRevision.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * 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. - */ -package git4idea.history.wholeTree; - -import com.intellij.openapi.vcs.FilePath; -import com.intellij.openapi.vcs.VcsException; -import com.intellij.openapi.vcs.changes.ContentRevision; -import com.intellij.openapi.vcs.history.VcsRevisionNumber; -import git4idea.GitContentRevision; -import git4idea.GitRevisionNumber; -import org.jetbrains.annotations.NotNull; - -import java.util.List; - -/** - * @author irengrig - */ -public class GitMultipleContentsRevision implements ContentRevision { - private final FilePath myPath; - private final List<GitRevisionNumber> myList; - protected ContentRevision myRevision; - - public GitMultipleContentsRevision(final FilePath path, - final List<GitRevisionNumber> list, - final GitContentRevision contentRevision) throws VcsException { - myPath = path; - myList = list; - myRevision = contentRevision; - } - - @Override - public String getContent() throws VcsException { - return myRevision.getContent(); - } - - @NotNull - @Override - public FilePath getFile() { - return myPath; - } - - @NotNull - @Override - public VcsRevisionNumber getRevisionNumber() { - return myRevision.getRevisionNumber(); - } - - public List<GitRevisionNumber> getList() { - return myList; - } -} diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/SelectRevisionInGitLogAction.java b/plugins/git4idea/src/git4idea/history/wholeTree/SelectRevisionInGitLogAction.java index 7c88a1cdeb24..dfd355813dbb 100644 --- a/plugins/git4idea/src/git4idea/history/wholeTree/SelectRevisionInGitLogAction.java +++ b/plugins/git4idea/src/git4idea/history/wholeTree/SelectRevisionInGitLogAction.java @@ -16,7 +16,7 @@ import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentManager; import com.intellij.vcs.log.impl.VcsLogContentProvider; import com.intellij.vcs.log.impl.VcsLogManager; -import com.intellij.vcs.log.ui.VcsLogUI; +import com.intellij.vcs.log.ui.VcsLogUiImpl; import git4idea.i18n.GitBundle; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -56,7 +56,7 @@ public class SelectRevisionInGitLogAction extends DumbAwareAction { Runnable selectCommit = new Runnable() { @Override public void run() { - VcsLogUI logUi = log.getLogUi(); + VcsLogUiImpl logUi = log.getLogUi(); if (logUi == null) { return; } diff --git a/plugins/git4idea/src/git4idea/log/GitLogProvider.java b/plugins/git4idea/src/git4idea/log/GitLogProvider.java index 88aae2a17f3b..5a679d11ac69 100644 --- a/plugins/git4idea/src/git4idea/log/GitLogProvider.java +++ b/plugins/git4idea/src/git4idea/log/GitLogProvider.java @@ -72,8 +72,8 @@ public class GitLogProvider implements VcsLogProvider { return Collections.emptyList(); } - String[] params = ArrayUtil.mergeArrays(ArrayUtil.toStringArray(GitHistoryUtils.LOG_ALL), - "--encoding=UTF-8", "--full-history", "--sparse", "--max-count=" + commitCount); + String[] params = ArrayUtil.mergeArrays(ArrayUtil.toStringArray(GitHistoryUtils.LOG_ALL), "--encoding=UTF-8", "--full-history", + "--sparse", "--max-count=" + commitCount); if (ordered) { params = ArrayUtil.append(params, "--date-order"); } @@ -87,7 +87,7 @@ public class GitLogProvider implements VcsLogProvider { return Collections.emptyList(); } - return GitHistoryUtils.readAllHashes(myProject, root, userRegistry); + return GitHistoryUtils.readCommits(myProject, root, userRegistry, GitHistoryUtils.LOG_ALL); } @NotNull @@ -115,11 +115,12 @@ public class GitLogProvider implements VcsLogProvider { Collection<GitRemoteBranch> remoteBranches = repository.getBranches().getRemoteBranches(); Collection<VcsRef> refs = new ArrayList<VcsRef>(localBranches.size() + remoteBranches.size()); for (GitLocalBranch localBranch : localBranches) { - refs.add(myVcsObjectsFactory.createRef(HashImpl.build(localBranch.getHash()), localBranch.getName(), GitRefManager.LOCAL_BRANCH, root)); + refs.add( + myVcsObjectsFactory.createRef(HashImpl.build(localBranch.getHash()), localBranch.getName(), GitRefManager.LOCAL_BRANCH, root)); } for (GitRemoteBranch remoteBranch : remoteBranches) { refs.add(myVcsObjectsFactory.createRef(HashImpl.build(remoteBranch.getHash()), remoteBranch.getNameForLocalOperations(), - GitRefManager.REMOTE_BRANCH, root)); + GitRefManager.REMOTE_BRANCH, root)); } String currentRevision = repository.getCurrentRevision(); if (currentRevision != null) { // null => fresh repository @@ -178,9 +179,9 @@ public class GitLogProvider implements VcsLogProvider { @NotNull @Override - public List<? extends VcsFullCommitDetails> getFilteredDetails(@NotNull final VirtualFile root, - @NotNull VcsLogFilterCollection filterCollection, - int maxCount) throws VcsException { + public List<TimedVcsCommit> getCommitsMatchingFilter(@NotNull final VirtualFile root, + @NotNull VcsLogFilterCollection filterCollection, + int maxCount) throws VcsException { if (!isRepositoryReady(root)) { return Collections.emptyList(); } @@ -188,18 +189,19 @@ public class GitLogProvider implements VcsLogProvider { List<String> filterParameters = ContainerUtil.newArrayList(); if (filterCollection.getBranchFilter() != null) { - // git doesn't support filtering by several branches very well (--branches parameter give a weak pattern capabilities) - // => by now assuming there is only one branch filter. - if (filterCollection.getBranchFilter().getBranchNames().size() > 1) { - LOG.warn("More than one branch filter was passed. Using only the first one."); - } - String branch = filterCollection.getBranchFilter().getBranchNames().iterator().next(); GitRepository repository = getRepository(root); assert repository != null : "repository is null for root " + root + " but was previously reported as 'ready'"; - if (repository.getBranches().findBranchByName(branch) == null) { + + boolean atLeastOneBranchExists = false; + for (String branchName : filterCollection.getBranchFilter().getBranchNames()) { + if (branchName.equals("HEAD") || repository.getBranches().findBranchByName(branchName) != null) { + filterParameters.add(branchName); + atLeastOneBranchExists = true; + } + } + if (!atLeastOneBranchExists) { // no such branches in this repository => filter matches nothing return Collections.emptyList(); } - filterParameters.add(branch); } else { filterParameters.addAll(GitHistoryUtils.LOG_ALL); @@ -240,7 +242,7 @@ public class GitLogProvider implements VcsLogProvider { } } - return GitHistoryUtils.getAllDetails(myProject, root, filterParameters); + return GitHistoryUtils.readCommits(myProject, root, Consumer.EMPTY_CONSUMER, filterParameters); } @Nullable @@ -257,6 +259,11 @@ public class GitLogProvider implements VcsLogProvider { return GitBranchUtil.getBranches(myProject, root, true, true, commitHash.asString()); } + @Override + public boolean supportsFastUnorderedCommits() { + return true; + } + private static String prepareParameter(String paramName, String value) { return "--" + paramName + "=" + value; // no value quoting needed, because the parameter itself will be quoted by GeneralCommandLine } diff --git a/plugins/git4idea/src/git4idea/merge/GitConflictResolver.java b/plugins/git4idea/src/git4idea/merge/GitConflictResolver.java index 2471669ce0fa..214c026307d5 100644 --- a/plugins/git4idea/src/git4idea/merge/GitConflictResolver.java +++ b/plugins/git4idea/src/git4idea/merge/GitConflictResolver.java @@ -17,13 +17,13 @@ package git4idea.merge; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; -import com.intellij.notification.NotificationType; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.AbstractVcsHelper; import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.merge.MergeDialogCustomizer; import com.intellij.openapi.vcs.merge.MergeProvider; import com.intellij.openapi.vfs.LocalFileSystem; @@ -179,9 +179,9 @@ public class GitConflictResolver { "You should <a href='resolve'>resolve</a> all conflicts before update. <br>" + myParams.myErrorNotificationAdditionalDescription); } - + private void notifyWarning(String title, String content) { - myPlatformFacade.getNotificator(myProject).notifyStrongWarning(title, content, new ResolveNotificationListener()); + VcsNotifier.getInstance(myProject).notifyImportantWarning(title, content, new ResolveNotificationListener()); } private boolean merge(boolean mergeDialogInvokedFromNotification) { @@ -229,11 +229,11 @@ public class GitConflictResolver { private void notifyException(VcsException e) { LOG.info("mergeFiles ", e); final String description = "Couldn't check the working tree for unmerged files because of an error."; - GitVcs.IMPORTANT_ERROR_NOTIFICATION.createNotification(myParams.myErrorNotificationTitle, - description + myParams.myErrorNotificationAdditionalDescription + "<br/>" + - e.getLocalizedMessage(), - NotificationType.ERROR, - new ResolveNotificationListener()).notify(myProject); + VcsNotifier.getInstance(myProject).notifyError(myParams.myErrorNotificationTitle, + description + myParams.myErrorNotificationAdditionalDescription + "<br/>" + + e.getLocalizedMessage(), + new ResolveNotificationListener() + ); } diff --git a/plugins/git4idea/src/git4idea/push/GitPushResult.java b/plugins/git4idea/src/git4idea/push/GitPushResult.java index 995a3a4b7058..1d105eaea0f1 100644 --- a/plugins/git4idea/src/git4idea/push/GitPushResult.java +++ b/plugins/git4idea/src/git4idea/push/GitPushResult.java @@ -20,11 +20,11 @@ import com.intellij.history.LocalHistory; import com.intellij.ide.BrowserUtil; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; -import com.intellij.notification.NotificationType; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.ex.ProjectLevelVcsManagerEx; import com.intellij.openapi.vcs.update.ActionInfo; import com.intellij.openapi.vcs.update.UpdateInfoTree; @@ -32,7 +32,6 @@ import com.intellij.openapi.vcs.update.UpdatedFiles; import git4idea.GitBranch; import git4idea.GitRevisionNumber; import git4idea.GitUtil; -import git4idea.GitVcs; import git4idea.branch.GitBranchUtil; import git4idea.merge.MergeChangeCollector; import git4idea.repo.GitRepository; @@ -45,9 +44,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -/** -* @author Kirill Likhodedov -*/ class GitPushResult { private static final Logger LOG = Logger.getInstance(GitPushResult.class); @@ -221,15 +217,14 @@ class GitPushResult { } /** - * Constructs the HTML-formatted message from error outputs of failed repositories. + * Constructs the HTML-formatted message from error outputs of failed repositories and notify. * If there is only 1 repository in the project, just returns the error without writing the repository url (to avoid confusion for people * with only 1 root ever). * Otherwise adds repository URL to the error that repository produced. * * The procedure also includes collecting for updated files (if an auto-update was performed during the push), which may be lengthy. */ - @NotNull - Notification createNotification() { + void createPushNotificationAndNotify() { final UpdatedFiles updatedFiles = collectUpdatedFiles(); GroupedResult groupedResult = group(); @@ -245,7 +240,6 @@ class GitPushResult { int pushedCommitsNumber = calcPushedCommitTotalNumber(myResults); String title; - NotificationType notificationType; if (error) { if (onlyError) { title = "Push failed"; @@ -255,16 +249,13 @@ class GitPushResult { title += ", " + commits(pushedCommitsNumber) + " pushed"; } } - notificationType = NotificationType.ERROR; } else if (rejected) { if (onlyRejected) { title = "Push rejected"; } else { title = "Push partially rejected, " + commits(pushedCommitsNumber) + " pushed"; } - notificationType = NotificationType.WARNING; } else { - notificationType = NotificationType.INFORMATION; title = "Push successful"; } @@ -276,18 +267,23 @@ class GitPushResult { sb.append(errorReport); sb.append(rejectedReport); sb.append(successReport); - + if (!updatedFiles.isEmpty()) { sb.append("<a href='UpdatedFiles'>View files updated during the push</a>"); } NotificationListener viewUpdateFilesListener = new ViewUpdatedFilesNotificationListener(updatedFiles); + VcsNotifier vcsNotifier = VcsNotifier.getInstance(myProject); if (onlySuccess) { - return new Notification(GitVcs.NOTIFICATION_GROUP_ID.getDisplayId(), title, sb.toString(), notificationType, viewUpdateFilesListener).setImportant(false); + vcsNotifier.notifySuccess(title, sb.toString(), viewUpdateFilesListener); + } + else if (error) { + vcsNotifier.notifyError(title, sb.toString(), viewUpdateFilesListener); + } + else { + vcsNotifier.notifyImportantWarning(title, sb.toString(), viewUpdateFilesListener); } - - return new Notification(GitVcs.IMPORTANT_ERROR_NOTIFICATION.getDisplayId(), title, sb.toString(), notificationType, viewUpdateFilesListener); } @NotNull diff --git a/plugins/git4idea/src/git4idea/push/GitPusher.java b/plugins/git4idea/src/git4idea/push/GitPusher.java index 56b3d58c7aab..31e289dba806 100644 --- a/plugins/git4idea/src/git4idea/push/GitPusher.java +++ b/plugins/git4idea/src/git4idea/push/GitPusher.java @@ -15,8 +15,6 @@ */ package git4idea.push; -import com.intellij.notification.Notification; -import com.intellij.notification.NotificationType; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressIndicator; @@ -24,6 +22,7 @@ import com.intellij.openapi.progress.Task; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.update.UpdatedFiles; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ui.UIUtil; @@ -53,8 +52,6 @@ import java.util.concurrent.atomic.AtomicInteger; /** * Collects information to push and performs the push. - * - * @author Kirill Likhodedov */ public final class GitPusher { @@ -356,8 +353,7 @@ public final class GitPusher { catch (VcsException e) { LOG.error(String.format("Couldn't set up tracking for source branch %s, target branch %s, remote %s in root %s", source, dest, remote, repository), e); - Notificator.getInstance(project).notify(GitVcs.NOTIFICATION_GROUP_ID, "", "Couldn't set up branch tracking", - NotificationType.ERROR); + VcsNotifier.getInstance(project).notifyWeakError("Couldn't set up branch tracking"); } } } @@ -461,11 +457,11 @@ public final class GitPusher { result.mergeFrom(previousResult); if (result.isEmpty()) { - GitVcs.NOTIFICATION_GROUP_ID.createNotification("Nothing to push", NotificationType.INFORMATION).notify(myProject); + VcsNotifier.getInstance(myProject).notifyInfo("Nothing to push"); } else if (result.wasErrorCancelOrNotAuthorized()) { // if there was an error on any repo, we won't propose to update even if current branch of a repo was rejected - result.createNotification().notify(myProject); + result.createPushNotificationAndNotify(); } else { // there were no errors, but there might be some rejected branches on some of the repositories @@ -504,7 +500,7 @@ public final class GitPusher { } - result.createNotification().notify(myProject); + result.createPushNotificationAndNotify(); } } @@ -577,7 +573,7 @@ public final class GitPusher { description = "Push has been cancelled, because there were conflicts during update.<br/>" + "Check that conflicts were resolved correctly, and invoke push again."; } - new Notification(GitVcs.MINOR_NOTIFICATION.getDisplayId(), title, description, NotificationType.WARNING).notify(myProject); + VcsNotifier.getInstance(myProject).notifyMinorWarning(title, description); return false; } else { diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaser.java b/plugins/git4idea/src/git4idea/rebase/GitRebaser.java index d9869b2c0504..65883e848bd0 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaser.java +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaser.java @@ -127,7 +127,7 @@ public class GitRebaser { return allMerged ? GitUpdateResult.SUCCESS_WITH_RESOLVED_CONFLICTS : GitUpdateResult.INCOMPLETE; } else if (untrackedWouldBeOverwrittenDetector.wasMessageDetected()) { LOG.info("handleRebaseFailure: untracked files would be overwritten by checkout"); - UntrackedFilesNotifier.notifyUntrackedFilesOverwrittenBy(myProject, ServiceManager.getService(myProject, GitPlatformFacade.class), + UntrackedFilesNotifier.notifyUntrackedFilesOverwrittenBy(myProject, untrackedWouldBeOverwrittenDetector.getFiles(), "rebase", null); return GitUpdateResult.ERROR; } else { @@ -378,7 +378,7 @@ public class GitRebaser { return allMerged ? GitUpdateResult.SUCCESS_WITH_RESOLVED_CONFLICTS : GitUpdateResult.INCOMPLETE; } else if (untrackedWouldBeOverwrittenDetector.wasMessageDetected()) { LOG.info("handleRebaseFailure: untracked files would be overwritten by checkout"); - UntrackedFilesNotifier.notifyUntrackedFilesOverwrittenBy(myProject, ServiceManager.getService(myProject, GitPlatformFacade.class), + UntrackedFilesNotifier.notifyUntrackedFilesOverwrittenBy(myProject, untrackedWouldBeOverwrittenDetector.getFiles(), "rebase", null); return GitUpdateResult.ERROR; } else { diff --git a/plugins/git4idea/src/git4idea/roots/GitIntegrationEnabler.java b/plugins/git4idea/src/git4idea/roots/GitIntegrationEnabler.java index c06a0aec1ed7..af429ae806c8 100644 --- a/plugins/git4idea/src/git4idea/roots/GitIntegrationEnabler.java +++ b/plugins/git4idea/src/git4idea/roots/GitIntegrationEnabler.java @@ -15,132 +15,58 @@ */ package git4idea.roots; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.Condition; -import com.intellij.openapi.vcs.AbstractVcs; -import com.intellij.openapi.vcs.ProjectLevelVcsManager; -import com.intellij.openapi.vcs.VcsDirectoryMapping; -import com.intellij.openapi.vcs.VcsRoot; -import com.intellij.openapi.vcs.roots.VcsRootErrorsFinder; -import com.intellij.openapi.vfs.VfsUtilCore; +import com.intellij.openapi.vcs.VcsNotifier; +import com.intellij.openapi.vcs.roots.VcsIntegrationEnabler; +import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; -import git4idea.GitPlatformFacade; +import git4idea.GitUtil; import git4idea.GitVcs; -import git4idea.Notificator; import git4idea.commands.Git; import git4idea.commands.GitCommandResult; import org.jetbrains.annotations.NotNull; -import java.util.*; +public class GitIntegrationEnabler extends VcsIntegrationEnabler<GitVcs> { -import static com.intellij.dvcs.DvcsUtil.joinRootsPaths; -import static com.intellij.openapi.util.text.StringUtil.pluralize; - -/** - * @author Kirill Likhodedov - */ -public class GitIntegrationEnabler { - - private final @NotNull Project myProject; private final @NotNull Git myGit; - private final @NotNull GitPlatformFacade myPlatformFacade; private static final Logger LOG = Logger.getInstance(GitIntegrationEnabler.class); - public GitIntegrationEnabler(@NotNull Project project, @NotNull Git git, @NotNull GitPlatformFacade platformFacade) { - myProject = project; + public GitIntegrationEnabler(@NotNull GitVcs vcs, @NotNull Git git) { + super(vcs); myGit = git; - myPlatformFacade = platformFacade; - } - - public void enable(@NotNull Collection<VcsRoot> vcsRoots) { - Notificator notificator = myPlatformFacade.getNotificator(myProject); - Collection<VcsRoot> gitRoots = ContainerUtil.filter(vcsRoots, new Condition<VcsRoot>() { - @Override - public boolean value(VcsRoot root) { - AbstractVcs vcs = root.getVcs(); - return vcs != null && vcs.getName().equals(GitVcs.NAME); - } - }); - Collection<VirtualFile> roots = VcsRootErrorsFinder.vcsRootsToVirtualFiles(gitRoots); - VirtualFile projectDir = myProject.getBaseDir(); - assert projectDir != null : "Base dir is unexpectedly null for project: " + myProject; - - if (gitRoots.isEmpty()) { - boolean succeeded = gitInitOrNotifyError(notificator, projectDir); - if (succeeded) { - addVcsRoots(Collections.singleton(projectDir)); - } - } - else { - assert !roots.isEmpty(); - if (roots.size() > 1 || isProjectBelowVcs(roots)) { - notifyAddedRoots(notificator, roots); - } - addVcsRoots(roots); - } - } - - private boolean isProjectBelowVcs(@NotNull Collection<VirtualFile> gitRoots) { - //check if there are vcs roots strictly above the project dir - VirtualFile baseDir = myProject.getBaseDir(); - for (VirtualFile root : gitRoots) { - if (VfsUtilCore.isAncestor(root, baseDir, true)) { - return true; - } - } - return false; - } - - private static void notifyAddedRoots(Notificator notificator, Collection<VirtualFile> roots) { - notificator.notifySuccess("", String.format("Added Git %s: %s", pluralize("root", roots.size()), joinRootsPaths(roots))); } - private boolean gitInitOrNotifyError(@NotNull Notificator notificator, @NotNull final VirtualFile projectDir) { + protected boolean initOrNotifyError(@NotNull final VirtualFile projectDir) { + VcsNotifier vcsNotifier = VcsNotifier.getInstance(myProject); GitCommandResult result = myGit.init(myProject, projectDir); if (result.success()) { refreshGitDir(projectDir); - notificator.notifySuccess("", "Created Git repository in " + projectDir.getPresentableUrl()); + vcsNotifier.notifySuccess("Created Git repository in " + projectDir.getPresentableUrl()); return true; } else { - if (((GitVcs)myPlatformFacade.getVcs(myProject)).getExecutableValidator().checkExecutableAndNotifyIfNeeded()) { - notificator.notifyError("Couldn't git init " + projectDir.getPresentableUrl(), result.getErrorOutputAsHtmlString()); + if (myVcs.getExecutableValidator().checkExecutableAndNotifyIfNeeded()) { + vcsNotifier.notifyError("Couldn't git init " + projectDir.getPresentableUrl(), result.getErrorOutputAsHtmlString()); LOG.info(result.getErrorOutputAsHtmlString()); } return false; } } - private void refreshGitDir(final VirtualFile projectDir) { + private static void refreshGitDir(final VirtualFile projectDir) { UIUtil.invokeAndWaitIfNeeded(new Runnable() { @Override public void run() { - myPlatformFacade.runReadAction(new Runnable() { + ApplicationManager.getApplication().runReadAction(new Runnable() { @Override public void run() { - myPlatformFacade.getLocalFileSystem().refreshAndFindFileByPath(projectDir.getPath() + "/.git"); + LocalFileSystem.getInstance().refreshAndFindFileByPath(projectDir.getPath() + "/" + GitUtil.DOT_GIT); } }); } }); } - - private void addVcsRoots(@NotNull Collection<VirtualFile> roots) { - ProjectLevelVcsManager vcsManager = myPlatformFacade.getVcsManager(myProject); - AbstractVcs vcs = myPlatformFacade.getVcs(myProject); - List<VirtualFile> currentGitRoots = Arrays.asList(vcsManager.getRootsUnderVcs(vcs)); - - List<VcsDirectoryMapping> mappings = new ArrayList<VcsDirectoryMapping>(vcsManager.getDirectoryMappings(vcs)); - - for (VirtualFile root : roots) { - if (!currentGitRoots.contains(root)) { - mappings.add(new VcsDirectoryMapping(root.getPath(), vcs.getName())); - } - } - vcsManager.setDirectoryMappings(mappings); - } } diff --git a/plugins/git4idea/src/git4idea/stash/GitChangesSaver.java b/plugins/git4idea/src/git4idea/stash/GitChangesSaver.java index 0bf3c430a503..1e783918c334 100644 --- a/plugins/git4idea/src/git4idea/stash/GitChangesSaver.java +++ b/plugins/git4idea/src/git4idea/stash/GitChangesSaver.java @@ -17,16 +17,15 @@ package git4idea.stash; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; -import com.intellij.notification.NotificationType; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.changes.ChangeListManagerEx; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.continuation.ContinuationContext; import git4idea.GitPlatformFacade; -import git4idea.GitVcs; import git4idea.commands.Git; import git4idea.config.GitVcsSettings; import git4idea.merge.GitConflictResolver; @@ -115,11 +114,14 @@ public abstract class GitChangesSaver { public void notifyLocalChangesAreNotRestored() { if (wereChangesSaved()) { LOG.info("Update is incomplete, changes are not restored"); - GitVcs.IMPORTANT_ERROR_NOTIFICATION.createNotification("Local changes were not restored", - "Before update your uncommitted changes were saved to <a href='saver'>" + getSaverName() + "</a>.<br/>" + - "Update is not complete, you have unresolved merges in your working tree<br/>" + - "Resolve conflicts, complete update and restore changes manually.", NotificationType.WARNING, - new ShowSavedChangesNotificationListener()).notify(myProject); + VcsNotifier.getInstance(myProject).notifyImportantWarning("Local changes were not restored", + "Before update your uncommitted changes were saved to <a href='saver'>" + + getSaverName() + + "</a>.<br/>" + + "Update is not complete, you have unresolved merges in your working tree<br/>" + + "Resolve conflicts, complete update and restore changes manually.", + new ShowSavedChangesNotificationListener() + ); } } diff --git a/plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java b/plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java index aa4ea51c68af..8e20a67fceab 100644 --- a/plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java +++ b/plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java @@ -17,11 +17,11 @@ package git4idea.stash; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; -import com.intellij.notification.NotificationType; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.history.VcsRevisionNumber; import com.intellij.openapi.vcs.impl.LocalChangesUnderRoots; @@ -30,7 +30,6 @@ import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.continuation.ContinuationContext; import git4idea.GitPlatformFacade; -import git4idea.GitVcs; import git4idea.commands.Git; import git4idea.commands.GitCommandResult; import git4idea.commands.GitHandlerUtil; @@ -179,24 +178,30 @@ public class GitStashChangesSaver extends GitChangesSaver { @Override protected void notifyUnresolvedRemain() { - GitVcs.IMPORTANT_ERROR_NOTIFICATION.createNotification("Local changes were restored with conflicts", - "Your uncommitted changes were saved to <a href='saver'>stash</a>.<br/>" + - "Unstash is not complete, you have unresolved merges in your working tree<br/>" + - "<a href='resolve'>Resolve</a> conflicts and drop the stash.", - NotificationType.WARNING, new NotificationListener() { - @Override - public void hyperlinkUpdate(@NotNull Notification notification, @NotNull HyperlinkEvent event) { - if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { - if (event.getDescription().equals("saver")) { - // we don't use #showSavedChanges to specify unmerged root first - GitUnstashDialog.showUnstashDialog(myProject, new ArrayList<VirtualFile>(myStashedRoots), myStashedRoots.iterator().next() - ); - } else if (event.getDescription().equals("resolve")) { - mergeNoProceed(); - } - } - } - }).notify(myProject); + VcsNotifier.getInstance(myProject).notifyImportantWarning("Local changes were restored with conflicts", + "Your uncommitted changes were saved to <a href='saver'>stash</a>.<br/>" + + "Unstash is not complete, you have unresolved merges in your working tree<br/>" + + "<a href='resolve'>Resolve</a> conflicts and drop the stash.", + new NotificationListener() { + @Override + public void hyperlinkUpdate(@NotNull Notification notification, + @NotNull HyperlinkEvent event) { + if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { + if (event.getDescription().equals("saver")) { + // we don't use #showSavedChanges to specify unmerged root first + GitUnstashDialog.showUnstashDialog(myProject, + new ArrayList<VirtualFile>( + myStashedRoots), + myStashedRoots.iterator().next() + ); + } + else if (event.getDescription().equals("resolve")) { + mergeNoProceed(); + } + } + } + } + ); } } diff --git a/plugins/git4idea/src/git4idea/ui/GitTagDialog.java b/plugins/git4idea/src/git4idea/ui/GitTagDialog.java index aafb3b05db0f..e5060ae2a77b 100644 --- a/plugins/git4idea/src/git4idea/ui/GitTagDialog.java +++ b/plugins/git4idea/src/git4idea/ui/GitTagDialog.java @@ -20,6 +20,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.DocumentAdapter; import git4idea.GitUtil; @@ -196,7 +197,8 @@ public class GitTagDialog extends DialogWrapper { } try { GitHandlerUtil.doSynchronously(h, GitBundle.getString("tagging.title"), h.printableCommandLine()); - GitUIUtil.notifySuccess(myProject, myTagNameTextField.getText(), "Created tag " + myTagNameTextField.getText() + " successfully."); + VcsNotifier.getInstance(myProject).notifySuccess(myTagNameTextField.getText(), + "Created tag " + myTagNameTextField.getText() + " successfully."); } finally { exceptions.addAll(h.errors()); diff --git a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java index a6790ddb3a5f..63b51a8c4b56 100644 --- a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java +++ b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java @@ -19,7 +19,6 @@ import com.intellij.CommonBundle; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; -import com.intellij.notification.NotificationType; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.components.ServiceManager; @@ -32,12 +31,16 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Key; import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.history.VcsRevisionNumber; import com.intellij.openapi.vcs.merge.MergeDialogCustomizer; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.DocumentAdapter; import com.intellij.util.Consumer; -import git4idea.*; +import git4idea.GitPlatformFacade; +import git4idea.GitRevisionNumber; +import git4idea.GitUtil; +import git4idea.GitVcs; import git4idea.branch.GitBranchUtil; import git4idea.commands.*; import git4idea.config.GitVersionSpecialty; @@ -442,10 +445,9 @@ public class GitUnstashDialog extends DialogWrapper { @Override protected void notifyUnresolvedRemain() { - GitVcs.IMPORTANT_ERROR_NOTIFICATION.createNotification("Conflicts were not resolved during unstash", - "Unstash is not complete, you have unresolved merges in your working tree<br/>" + - "<a href='resolve'>Resolve</a> conflicts.", - NotificationType.WARNING, new NotificationListener() { + VcsNotifier.getInstance(myProject).notifyImportantWarning("Conflicts were not resolved during unstash", + "Unstash is not complete, you have unresolved merges in your working tree<br/>" + + "<a href='resolve'>Resolve</a> conflicts.", new NotificationListener() { @Override public void hyperlinkUpdate(@NotNull Notification notification, @NotNull HyperlinkEvent event) { if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { @@ -454,7 +456,8 @@ public class GitUnstashDialog extends DialogWrapper { } } } - }).notify(myProject); + } + ); } } diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java index 94f49ec9aa95..645fb24bcd1e 100644 --- a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java +++ b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java @@ -20,7 +20,6 @@ import com.intellij.dvcs.ui.BranchActionGroupPopup; import com.intellij.dvcs.ui.RootAction; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; -import com.intellij.notification.NotificationType; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.DefaultActionGroup; @@ -28,6 +27,7 @@ import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.ListPopup; import com.intellij.openapi.util.Condition; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.ui.popup.list.ListPopupImpl; import git4idea.GitUtil; import git4idea.GitVcs; @@ -158,20 +158,24 @@ class GitBranchPopup { } private void notifyAboutSyncedBranches() { - GitVcs.IMPORTANT_ERROR_NOTIFICATION.createNotification("Synchronous branch control enabled", - "You have several Git roots in the project and they all are checked out at the same branch. " + - "We've enabled synchronous branch control for the project. <br/>" + - "If you wish to control branches in different roots separately, you may <a href='settings'>disable</a> the setting.", - NotificationType.INFORMATION, new NotificationListener() { - @Override public void hyperlinkUpdate(@NotNull Notification notification, @NotNull HyperlinkEvent event) { - if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { - ShowSettingsUtil.getInstance().showSettingsDialog(myProject, myVcs.getConfigurable().getDisplayName()); - if (myVcsSettings.getSyncSetting() == GitBranchSyncSetting.DONT) { - notification.expire(); - } - } - } - }).notify(myProject); + VcsNotifier.getInstance(myProject).notifyImportantInfo("Synchronous branch control enabled", + "You have several Git roots in the project and they all are checked out at the same branch. " + + "We've enabled synchronous branch control for the project. <br/>" + + "If you wish to control branches in different roots separately, you may <a href='settings'>disable</a> the setting.", + new NotificationListener() { + @Override + public void hyperlinkUpdate(@NotNull Notification notification, + @NotNull HyperlinkEvent event) { + if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { + ShowSettingsUtil.getInstance().showSettingsDialog(myProject, myVcs + .getConfigurable().getDisplayName()); + if (myVcsSettings.getSyncSetting() == GitBranchSyncSetting.DONT) { + notification.expire(); + } + } + } + } + ); } private ActionGroup createActions() { diff --git a/plugins/git4idea/src/git4idea/update/GitFetcher.java b/plugins/git4idea/src/git4idea/update/GitFetcher.java index edac044604a7..71111366bdbd 100644 --- a/plugins/git4idea/src/git4idea/update/GitFetcher.java +++ b/plugins/git4idea/src/git4idea/update/GitFetcher.java @@ -16,15 +16,18 @@ package git4idea.update; import com.intellij.dvcs.DvcsUtil; -import com.intellij.notification.NotificationType; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vfs.VirtualFile; -import git4idea.*; +import git4idea.GitLocalBranch; +import git4idea.GitRemoteBranch; +import git4idea.GitUtil; +import git4idea.GitVcs; import git4idea.branch.GitBranchUtil; import git4idea.commands.*; import git4idea.config.GitVersionSpecialty; @@ -48,9 +51,6 @@ import java.util.regex.Pattern; import static git4idea.GitBranch.REFS_HEADS_PREFIX; import static git4idea.GitBranch.REFS_REMOTES_PREFIX; -/** - * @author Kirill Likhodedov - */ public class GitFetcher { private static final Logger LOG = Logger.getInstance(GitFetcher.class); @@ -285,9 +285,9 @@ public class GitFetcher { @NotNull GitFetchResult result, @Nullable String errorNotificationTitle, @NotNull Collection<? extends Exception> errors) { if (result.isSuccess()) { - GitVcs.NOTIFICATION_GROUP_ID.createNotification("Fetched successfully" + result.getAdditionalInfo(), NotificationType.INFORMATION).notify(project); + VcsNotifier.getInstance(project).notifySuccess("Fetched successfully" + result.getAdditionalInfo()); } else if (result.isCancelled()) { - GitVcs.NOTIFICATION_GROUP_ID.createNotification("Fetch cancelled by user" + result.getAdditionalInfo(), NotificationType.WARNING).notify(project); + VcsNotifier.getInstance(project).notifyMinorWarning("", "Fetch cancelled by user" + result.getAdditionalInfo()); } else if (result.isNotAuthorized()) { String title; String description; @@ -299,11 +299,11 @@ public class GitFetcher { description = "Couldn't authorize"; } description += result.getAdditionalInfo(); - GitUIUtil.notifyMessage(project, title, description, NotificationType.ERROR, true, null); + GitUIUtil.notifyMessage(project, title, description, true, null); } else { GitVcs instance = GitVcs.getInstance(project); if (instance != null && instance.getExecutableValidator().isExecutableValid()) { - GitUIUtil.notifyMessage(project, "Fetch failed", result.getAdditionalInfo(), NotificationType.ERROR, true, errors); + GitUIUtil.notifyMessage(project, "Fetch failed", result.getAdditionalInfo(), true, errors); } } } @@ -336,12 +336,12 @@ public class GitFetcher { } } if (notifySuccess) { - GitUIUtil.notifySuccess(myProject, "", "Fetched successfully"); + VcsNotifier.getInstance(myProject).notifySuccess("Fetched successfully"); } String addInfo = makeAdditionalInfoByRoot(additionalInfo); if (!StringUtil.isEmptyOrSpaces(addInfo)) { - Notificator.getInstance(myProject).notify(GitVcs.MINOR_NOTIFICATION, "Fetch details", addInfo, NotificationType.INFORMATION); + VcsNotifier.getInstance(myProject).notifyMinorInfo("Fetch details", addInfo); } return true; diff --git a/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java b/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java index 6221527d79be..4815eb781fce 100644 --- a/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java +++ b/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java @@ -30,7 +30,6 @@ import com.intellij.openapi.vcs.update.UpdatedFiles; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ui.UIUtil; import git4idea.GitUtil; -import git4idea.GitPlatformFacade; import git4idea.branch.GitBranchPair; import git4idea.commands.*; import git4idea.merge.GitConflictResolver; @@ -136,7 +135,7 @@ public class GitMergeUpdater extends GitUpdater { } else if (untrackedFilesWouldBeOverwrittenByMergeDetector.wasMessageDetected()) { LOG.info("handleMergeFailure: untracked files would be overwritten by merge"); - UntrackedFilesNotifier.notifyUntrackedFilesOverwrittenBy(myProject, ServiceManager.getService(myProject, GitPlatformFacade.class), + UntrackedFilesNotifier.notifyUntrackedFilesOverwrittenBy(myProject, untrackedFilesWouldBeOverwrittenByMergeDetector.getFiles(), "merge", null); return GitUpdateResult.ERROR; } diff --git a/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java b/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java index b314cc914a41..04ed3ac845ca 100644 --- a/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java +++ b/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java @@ -20,12 +20,12 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.update.UpdatedFiles; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ui.UIUtil; import git4idea.GitBranch; import git4idea.GitUtil; -import git4idea.Notificator; import git4idea.branch.GitBranchPair; import git4idea.commands.Git; import git4idea.commands.GitCommandResult; @@ -147,10 +147,11 @@ public class GitRebaseUpdater extends GitUpdater { // this is not critical, and update has already happened, // so we just notify the user about problems with collecting the updated changes. LOG.info("Couldn't mark end for repository " + myRoot, e); - Notificator.getInstance(myProject). - notifyWeakWarning("Couldn't collect the updated files info", - String.format("Update of %s was successful, but we couldn't collect the updated changes because of an error", - myRoot), null); + VcsNotifier.getInstance(myProject). + notifyMinorWarning("Couldn't collect the updated files info", + String.format("Update of %s was successful, but we couldn't collect the updated changes because of an error", + myRoot), null + ); } return result.success(); } diff --git a/plugins/git4idea/src/git4idea/util/GitPreservingProcess.java b/plugins/git4idea/src/git4idea/util/GitPreservingProcess.java index b95d480ada24..b42c1133e89c 100644 --- a/plugins/git4idea/src/git4idea/util/GitPreservingProcess.java +++ b/plugins/git4idea/src/git4idea/util/GitPreservingProcess.java @@ -22,13 +22,13 @@ import com.intellij.openapi.util.Clock; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.history.VcsRevisionNumber; import com.intellij.openapi.vcs.merge.MergeDialogCustomizer; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.text.DateFormatUtil; import git4idea.GitPlatformFacade; import git4idea.GitUtil; -import git4idea.Notificator; import git4idea.commands.Git; import git4idea.merge.GitConflictResolver; import git4idea.repo.GitRepository; @@ -155,7 +155,7 @@ public class GitPreservingProcess { return true; } catch (VcsException e) { LOG.info("Couldn't save local changes", e); - Notificator.getInstance(myProject).notifyError( + VcsNotifier.getInstance(myProject).notifyError( "Couldn't save uncommitted changes.", String.format("Tried to save uncommitted changes in stash before %s, but failed with an error.<br/>%s", myOperationTitle, join(e.getMessages()))); @@ -174,8 +174,9 @@ public class GitPreservingProcess { } catch (VcsException e) { LOG.info("Couldn't load local changes", e); - Notificator.getInstance(myProject).notifyError("Couldn't restore uncommitted changes", - String.format("Tried to unstash uncommitted changes, but failed with error.<br/>%s",join(e.getMessages()))); + VcsNotifier.getInstance(myProject).notifyError("Couldn't restore uncommitted changes", + String.format("Tried to unstash uncommitted changes, but failed with error.<br/>%s", + join(e.getMessages()))); } } } diff --git a/plugins/git4idea/src/git4idea/util/GitUIUtil.java b/plugins/git4idea/src/git4idea/util/GitUIUtil.java index ae44f756a8cd..71a818d186b8 100644 --- a/plugins/git4idea/src/git4idea/util/GitUIUtil.java +++ b/plugins/git4idea/src/git4idea/util/GitUIUtil.java @@ -15,19 +15,16 @@ */ package git4idea.util; -import com.intellij.notification.NotificationGroup; -import com.intellij.notification.NotificationListener; -import com.intellij.notification.NotificationType; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.AbstractVcsHelper; import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.ListCellRendererWrapper; import git4idea.GitBranch; import git4idea.GitUtil; -import git4idea.GitVcs; import git4idea.i18n.GitBundle; import git4idea.repo.GitRepository; import org.jetbrains.annotations.NonNls; @@ -55,51 +52,55 @@ public class GitUIUtil { /** * A private constructor for utility class */ - private GitUIUtil() { } - - public static void notify(@NotNull NotificationGroup group, @NotNull Project project, @Nullable String title, @Nullable String description, @NotNull NotificationType type, @Nullable NotificationListener listener) { - // title can't be null, but can be empty; description can't be neither null, nor empty - if (title == null) { - title = ""; - } - if (StringUtil.isEmptyOrSpaces(description)) { - description = title; - title = ""; - } - // if both title and description were empty, then it is a problem in the calling code => let assertion notify about that. - assert description != null : "description is null after StringUtil.isEmptyOrSpaces(). title: " + title; - group.createNotification(title, description, type, listener).notify(project.isDefault() ? null : project); + private GitUIUtil() { } - public static void notifyMessages(Project project, @Nullable String title, @Nullable String description, NotificationType type, boolean important, @Nullable Collection<String> messages) { + public static void notifyMessages(@NotNull Project project, + @NotNull String title, + @Nullable String description, + boolean important, + @Nullable Collection<String> messages) { String desc = (description != null ? description.replace("\n", "<br/>") : ""); if (messages != null && !messages.isEmpty()) { desc += StringUtil.join(messages, "<hr/><br/>"); } - NotificationGroup group = important ? GitVcs.IMPORTANT_ERROR_NOTIFICATION : GitVcs.NOTIFICATION_GROUP_ID; - notify(group, project, title, desc, type, null); + VcsNotifier notificator = VcsNotifier.getInstance(project); + if (important) { + notificator.notifyError(title, desc); + } + else { + notificator.notifyImportantWarning(title, desc, null); + } } - public static void notifyMessage(Project project, @Nullable String title, @Nullable String description, NotificationType type, boolean important, @Nullable Collection<? extends Exception> errors) { + public static void notifyMessage(Project project, + @NotNull String title, + @Nullable String description, + boolean important, + @Nullable Collection<? extends Exception> errors) { Collection<String> errorMessages; if (errors == null) { errorMessages = null; - } else { + } + else { errorMessages = new HashSet<String>(errors.size()); for (Exception error : errors) { if (error instanceof VcsException) { for (String message : ((VcsException)error).getMessages()) { errorMessages.add(message.replace("\n", "<br/>")); } - } else { + } + else { errorMessages.add(error.toString().replace("\n", "<br/>")); } } } - notifyMessages(project, title, description, type, important, errorMessages); + notifyMessages(project, title, description, important, errorMessages); } - public static void notifyError(Project project, String title, String description, boolean important, @Nullable Exception error) { notifyMessage(project, title, description, NotificationType.ERROR, important, Collections.singleton(error)); + public static void notifyError(Project project, String title, String description, boolean important, @Nullable Exception error) { + notifyMessage( + project, title, description, important, Collections.singleton(error)); } /** @@ -119,19 +120,8 @@ public class GitUIUtil { return content.toString(); } - /** - * Displays a "success"-notification. - */ - public static void notifySuccess(Project project, String title, String description) { - GitVcs.NOTIFICATION_GROUP_ID.createNotification(title, description, NotificationType.INFORMATION, null).notify(project); - } - - public static void notifyError(Project project, String title, String description) { - notifyMessage(project, title, description, NotificationType.ERROR, false, null); - } - public static void notifyImportantError(Project project, String title, String description) { - notifyMessage(project, title, description, NotificationType.ERROR, true, null); + notifyMessage(project, title, description, true, null); } public static void notifyGitErrors(Project project, String title, String description, Collection<VcsException> gitErrors) { @@ -145,7 +135,7 @@ public class GitUIUtil { for (VcsException e : gitErrors) { content.append(e.getLocalizedMessage()).append("<br/>"); } - notifyError(project, title, content.toString()); + notifyMessage(project, title, content.toString(), false, null); } /** diff --git a/plugins/git4idea/src/git4idea/util/UntrackedFilesNotifier.java b/plugins/git4idea/src/git4idea/util/UntrackedFilesNotifier.java index 55d6a63cbc15..6a867933e6aa 100644 --- a/plugins/git4idea/src/git4idea/util/UntrackedFilesNotifier.java +++ b/plugins/git4idea/src/git4idea/util/UntrackedFilesNotifier.java @@ -19,9 +19,9 @@ import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.changes.ui.SelectFilesDialog; import com.intellij.openapi.vfs.VirtualFile; -import git4idea.GitPlatformFacade; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -30,9 +30,6 @@ import javax.swing.event.HyperlinkEvent; import java.util.ArrayList; import java.util.Collection; -/** - * @author Kirill Likhodedov - */ public class UntrackedFilesNotifier { private UntrackedFilesNotifier() { @@ -44,13 +41,13 @@ public class UntrackedFilesNotifier { * @param operation the name of the Git operation that caused the error: {@code rebase, merge, checkout}. * @param description the content of the notification or null if the deafult content is to be used. */ - public static void notifyUntrackedFilesOverwrittenBy(@NotNull final Project project, @NotNull GitPlatformFacade platformFacade, + public static void notifyUntrackedFilesOverwrittenBy(@NotNull final Project project, @NotNull final Collection<VirtualFile> untrackedFiles, @NotNull final String operation, @Nullable String description) { final String notificationTitle = StringUtil.capitalize(operation) + " failed"; final String notificationDesc = description == null ? createUntrackedFilesOverwrittenDescription(operation, true) : description; - platformFacade.getNotificator(project).notifyError(notificationTitle, notificationDesc, + VcsNotifier.getInstance(project).notifyError(notificationTitle, notificationDesc, new NotificationListener() { @Override public void hyperlinkUpdate(@NotNull Notification notification, @NotNull HyperlinkEvent event) { diff --git a/plugins/git4idea/test-stepdefs/git4idea/GitCucumberWorld.java b/plugins/git4idea/test-stepdefs/git4idea/GitCucumberWorld.java index 89dfd4481245..0fc9dc3464cf 100644 --- a/plugins/git4idea/test-stepdefs/git4idea/GitCucumberWorld.java +++ b/plugins/git4idea/test-stepdefs/git4idea/GitCucumberWorld.java @@ -6,9 +6,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ProjectComponent; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.vcs.AbstractVcs; -import com.intellij.openapi.vcs.AbstractVcsHelper; -import com.intellij.openapi.vcs.ProjectLevelVcsManager; +import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vcs.changes.ChangeListManagerImpl; import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager; @@ -29,7 +27,6 @@ import git4idea.remote.GitHttpAuthTestService; import git4idea.repo.GitRepository; import git4idea.test.GitExecutor; import git4idea.test.GitTestUtil; -import git4idea.test.TestNotificator; import org.jetbrains.annotations.NotNull; import org.junit.Assert; import org.picocontainer.MutablePicoContainer; @@ -52,8 +49,6 @@ import static org.junit.Assume.assumeTrue; /** * <p>The container of test environment variables which should be visible from any step definition script.</p> * <p>Most of the fields are populated in the Before hook of the {@link GeneralStepdefs}.</p> - * - * @author Kirill Likhodedov */ public class GitCucumberWorld { @@ -70,7 +65,7 @@ public class GitCucumberWorld { public static GitVcs myVcs; public static MockVcsHelper myVcsHelper; - public static TestNotificator myNotificator; + public static TestVcsNotifier myNotificator; public static GitHttpAuthTestService myHttpAuthService; // only with @remote tag @@ -114,7 +109,7 @@ public class GitCucumberWorld { // because MockVcsHelper is not ready to be a full featured implementation for all tests. myVcsHelper = overrideService(myProject, AbstractVcsHelper.class, MockVcsHelper.class); myChangeListManager = (ChangeListManagerImpl)myPlatformFacade.getChangeListManager(myProject); - myNotificator = (TestNotificator)ServiceManager.getService(myProject, Notificator.class); + myNotificator = (TestVcsNotifier)ServiceManager.getService(myProject, VcsNotifier.class); myVcs = GitVcs.getInstance(myProject); virtualCommits = new GitTestVirtualCommitsHolder(); diff --git a/plugins/git4idea/testFramework/META-INF/plugin.xml b/plugins/git4idea/testFramework/META-INF/plugin.xml index 6ecf51797de2..18eb7ed6b97b 100644 --- a/plugins/git4idea/testFramework/META-INF/plugin.xml +++ b/plugins/git4idea/testFramework/META-INF/plugin.xml @@ -14,8 +14,8 @@ serviceImplementation="git4idea.test.TestDialogManager" overrides="true" /> - <projectService serviceInterface="git4idea.Notificator" - serviceImplementation="git4idea.test.TestNotificator" + <projectService serviceInterface="com.intellij.openapi.vcs.VcsNotifier" + serviceImplementation="com.intellij.openapi.vcs.TestVcsNotifier" overrides="true"/> </extensions> diff --git a/plugins/git4idea/testFramework/git4idea/test/GitTestPlatformFacade.groovy b/plugins/git4idea/testFramework/git4idea/test/GitTestPlatformFacade.groovy index 07f4a33c5aab..40c1200c28ec 100644 --- a/plugins/git4idea/testFramework/git4idea/test/GitTestPlatformFacade.groovy +++ b/plugins/git4idea/testFramework/git4idea/test/GitTestPlatformFacade.groovy @@ -14,27 +14,21 @@ * limitations under the License. */ package git4idea.test - import com.intellij.dvcs.test.DvcsTestPlatformFacade import com.intellij.openapi.project.Project import com.intellij.openapi.ui.DialogWrapper import com.intellij.openapi.vcs.AbstractVcs import com.intellij.openapi.vcs.ProjectLevelVcsManager import git4idea.GitPlatformFacade -import git4idea.Notificator import git4idea.config.GitVcsApplicationSettings import git4idea.config.GitVcsSettings import org.jetbrains.annotations.NotNull -/** - * - * @author Kirill Likhodedov - */ + class GitTestPlatformFacade extends DvcsTestPlatformFacade implements GitPlatformFacade { private static final GitVcsApplicationSettings ourAppSettings = new GitVcsApplicationSettings() private GitMockVcs myVcs; - private TestNotificator myNotificator; private TestDialogManager myTestDialogManager; private GitTestRepositoryManager myRepositoryManager; private GitMockVcsManager myVcsManager; @@ -56,15 +50,6 @@ class GitTestPlatformFacade extends DvcsTestPlatformFacade implements GitPlatfor @NotNull @Override - public Notificator getNotificator(@NotNull Project project) { - if (myNotificator == null) { - myNotificator = new TestNotificator(project); - } - return myNotificator; - } - - @NotNull - @Override public GitVcsSettings getSettings(Project project) { if (mySettings == null) { mySettings = new GitVcsSettings(ourAppSettings); diff --git a/plugins/git4idea/testFramework/git4idea/test/GitTestUtil.java b/plugins/git4idea/testFramework/git4idea/test/GitTestUtil.java index e5db2c9adfbd..d34e8da70d85 100644 --- a/plugins/git4idea/testFramework/git4idea/test/GitTestUtil.java +++ b/plugins/git4idea/testFramework/git4idea/test/GitTestUtil.java @@ -15,8 +15,6 @@ */ package git4idea.test; -import com.intellij.notification.Notification; -import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl; @@ -24,11 +22,8 @@ import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import git4idea.GitUtil; import git4idea.GitVcs; -import git4idea.Notificator; import git4idea.repo.GitRepository; -import junit.framework.Assert; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.jetbrains.ide.BuiltInServerManagerImpl; import java.io.File; @@ -41,11 +36,7 @@ import static com.intellij.openapi.vcs.VcsTestUtil.createDir; import static com.intellij.openapi.vcs.VcsTestUtil.createFile; import static git4idea.test.GitExecutor.git; import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNull; -/** - * @author Kirill Likhodedov - */ public class GitTestUtil { private static final String USER_NAME = "John Doe"; @@ -115,19 +106,6 @@ public class GitTestUtil { return repository; } - public static void assertNotification(@NotNull Project project, @Nullable Notification expected) { - if (expected == null) { - assertNull("Notification is unexpected here", expected); - return; - } - - Notification actualNotification = ((TestNotificator)ServiceManager.getService(project, Notificator.class)).getLastNotification(); - Assert.assertNotNull("No notification was shown", actualNotification); - Assert.assertEquals("Notification has wrong title", expected.getTitle(), actualNotification.getTitle()); - Assert.assertEquals("Notification has wrong type", expected.getType(), actualNotification.getType()); - Assert.assertEquals("Notification has wrong content", expected.getContent(), actualNotification.getContent()); - } - /** * Default port will be occupied by main idea instance => define the custom default to avoid searching of free port */ diff --git a/plugins/git4idea/testFramework/git4idea/test/TestNotificator.java b/plugins/git4idea/testFramework/git4idea/test/TestNotificator.java deleted file mode 100644 index e8ad4f749191..000000000000 --- a/plugins/git4idea/testFramework/git4idea/test/TestNotificator.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2000-2012 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 git4idea.test; - -import com.intellij.notification.Notification; -import com.intellij.notification.NotificationGroup; -import com.intellij.notification.NotificationListener; -import com.intellij.notification.NotificationType; -import com.intellij.openapi.project.Project; -import git4idea.Notificator; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * @author Kirill Likhodedov - */ -public class TestNotificator extends Notificator { - - public static final String TEST_NOTIFICATION_GROUP = "Test"; - private Notification myLastNotification; - - public TestNotificator(@NotNull Project project) { - super(project); - } - - public Notification getLastNotification() { - return myLastNotification; - } - - public void notify(@NotNull Notification notification) { - myLastNotification = notification; - } - - public void notify(@NotNull NotificationGroup notificationGroup, @NotNull String title, @NotNull String message, @NotNull NotificationType type) { - notify(notificationGroup, title, message, type, null); - } - - @Override - public void notifyError(@NotNull String title, @NotNull String message, @Nullable NotificationListener listener) { - myLastNotification = createNotification(title, message, NotificationType.ERROR); - } - - @Override - public void notifySuccess(@NotNull String title, @NotNull String message) { - myLastNotification = createNotification(title, message, NotificationType.INFORMATION); - } - - @Override - public void notifyWeakWarning(@NotNull String title, @NotNull String message, @Nullable NotificationListener listener) { - myLastNotification = createNotification(title, message, NotificationType.WARNING); - } - - @Override - public void notifyStrongWarning(@NotNull String title, @NotNull String content, @Nullable NotificationListener listener) { - myLastNotification = createNotification(title, content, NotificationType.WARNING); - } - - @NotNull - private static Notification createNotification(@NotNull String title, @NotNull String message, NotificationType type) { - return new Notification(TEST_NOTIFICATION_GROUP, title, message, type); - } - - public void notify(@NotNull NotificationGroup notificationGroup, @NotNull String title, @NotNull String message, - @NotNull NotificationType type, @Nullable NotificationListener listener) { - myLastNotification = createNotification(notificationGroup, title, message, type, listener); - } - - public void cleanup() { - myLastNotification = null; - } -} diff --git a/plugins/git4idea/tests/git4idea/roots/GitIntegrationEnablerTest.java b/plugins/git4idea/tests/git4idea/roots/GitIntegrationEnablerTest.java deleted file mode 100644 index 37b1d926303a..000000000000 --- a/plugins/git4idea/tests/git4idea/roots/GitIntegrationEnablerTest.java +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Copyright 2000-2013 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 git4idea.roots; - -import com.intellij.dvcs.test.MockVirtualFile; -import com.intellij.notification.Notification; -import com.intellij.notification.NotificationType; -import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.vcs.AbstractVcs; -import com.intellij.openapi.vcs.VcsRoot; -import com.intellij.openapi.vcs.VcsTestUtil; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.util.Function; -import com.intellij.util.containers.ContainerUtil; -import git4idea.GitUtil; -import git4idea.test.GitLightTest; -import git4idea.test.TestNotificator; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import java.io.File; -import java.util.*; - -import static org.junit.Assert.*; - -/** - * @author Nadya Zabrodina - */ -public class GitIntegrationEnablerTest extends GitLightTest { - - public AbstractVcs myVcs; - - @Override - @Before - public void setUp() { - super.setUp(); - myVcs = myPlatformFacade.getVcs(myProject); - } - - @After - public void tearDown() { - super.tearDown(); - } - - @Test - public void oneRootForTheWholeProjectThenJustAddVcsrRoot() { - Map<String, List<String>> map = new HashMap<String, List<String>>(); - map.put("git_init", Collections.<String>emptyList()); - doTest(given(Arrays.asList(".")), - map, null); - } - - @Test - public void noGitRootsThenInitAndNotify() { - Map<String, List<String>> map = new HashMap<String, List<String>>(); - map.put("git_init", Arrays.asList(".")); - map.put("vcs_roots", VcsTestUtil.toAbsolute(Arrays.asList("."), myProject)); - - - doTest(given(Collections.<String>emptyList()), - map, notification("Created Git repository in " + myProjectRoot)); - } - - @Test - public void belowGitNoInsideThenNotify() { - Map<String, List<String>> map = new HashMap<String, List<String>>(); - map.put("git_init", Collections.<String>emptyList()); - - doTest(given(Arrays.asList("..")), - map, notification("Added Git root: " + myTestRoot)); - } - - @Test - public void gitForProjectSomeInsideThenNotify() { - Map<String, List<String>> map = new HashMap<String, List<String>>(); - map.put("git_init", Collections.<String>emptyList()); - - doTest(given(Arrays.asList(".", "community")), - map, notification("Added Git roots: " + myProjectRoot + ", " + getPresentationForRoot("community"))); - } - - @Test - public void belowGitSomeInsideThenNotify() { - Map<String, List<String>> map = new HashMap<String, List<String>>(); - map.put("git_init", Collections.<String>emptyList()); - - doTest(given(Arrays.asList("..", "community")), - map, notification("Added Git roots: " + myTestRoot + ", " + getPresentationForRoot("community"))); - } - - @Test - public void notUnderGitSomeInsideThenNotify() { - Map<String, List<String>> map = new HashMap<String, List<String>>(); - map.put("git_init", Collections.<String>emptyList()); - - doTest(given(Arrays.asList("community", "contrib")), - map, notification( - "Added Git roots: " + getPresentationForRoot("community") + ", " + getPresentationForRoot("contrib"))); - } - - private void doTest(@NotNull Collection<VcsRoot> vcsRoots, @NotNull Map<String, List<String>> map, @Nullable Notification notification) { - - //default - if (map.get("vcs_roots") == null) { - map.put("vcs_roots", ContainerUtil.map(vcsRoots, new Function<VcsRoot, String>() { - - @Override - public String fun(VcsRoot root) { - assert root.getPath() != null; - return root.getPath().getPath(); - } - })); - } - - new GitIntegrationEnabler(myProject, myGit, myPlatformFacade).enable(vcsRoots); - - assertVcsRoots(map.get("vcs_roots")); - assertGitInit(map.get("git_init")); - assertNotificationShown(notification); - } - - void assertGitInit(@NotNull Collection<String> roots) { - for (String root : roots) { - File rootFile = new File(myProjectRoot, root); - assertTrue(new File(rootFile.getPath(), GitUtil.DOT_GIT).exists()); - } - } - - void assertVcsRoots(@NotNull Collection<String> expectedVcsRoots) { - VirtualFile[] actualRoots = myPlatformFacade.getVcsManager(myProject).getRootsUnderVcs(myPlatformFacade.getVcs(myProject)); - VcsTestUtil.assertEqualCollections(expectedVcsRoots, getPaths(actualRoots)); - } - - Collection<VcsRoot> given(@NotNull Collection<String> roots) { - return ContainerUtil.map(roots, new Function<String, VcsRoot>() { - - @Override - public VcsRoot fun(String s) { - return new VcsRoot(myVcs, new MockVirtualFile(VcsTestUtil.toAbsolute(s, myProject))); - } - }); - } - - Notification notification(String content) { - return new Notification("Test", "", content, NotificationType.INFORMATION); - } - - void assertNotificationShown(@Nullable Notification expected) { - if (expected != null) { - Notification actualNotification = ((TestNotificator)myPlatformFacade.getNotificator(myProject)).getLastNotification(); - assertNotNull("No notification was shown", actualNotification); - assertEquals("Notification has wrong title", expected.getTitle(), actualNotification.getTitle()); - assertEquals("Notification has wrong type", expected.getType(), actualNotification.getType()); - assertEquals("Notification has wrong content", adjustTestContent(expected.getContent()), actualNotification.getContent()); - } - } - - // we allow more spaces and line breaks in tests to make them more readable. - // After all, notifications display html, so all line breaks and extra spaces are ignored. - String adjustTestContent(@NotNull String s) { - StringBuilder res = new StringBuilder(); - String[] splits = s.split("\n"); - for (String split : splits) { - res.append(split.trim()); - } - - return res.toString(); - } - - @NotNull - public static Collection<String> getPaths(@NotNull VirtualFile[] virtualFiles) { - return ContainerUtil.map(virtualFiles, new Function<VirtualFile, String>() { - - @Override - public String fun(VirtualFile virtualFile) { - return virtualFile.getPath(); - } - }); - } - - @NotNull - private String getPresentationForRoot(@NotNull String root) { - return FileUtil.toSystemDependentName(VcsTestUtil.toAbsolute(root, myProject)); - } -} diff --git a/plugins/github/src/org/jetbrains/plugins/github/util/GithubNotifications.java b/plugins/github/src/org/jetbrains/plugins/github/util/GithubNotifications.java index a6f8584486cc..d2edabdf4be3 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/util/GithubNotifications.java +++ b/plugins/github/src/org/jetbrains/plugins/github/util/GithubNotifications.java @@ -15,13 +15,11 @@ */ package org.jetbrains.plugins.github.util; -import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; -import com.intellij.notification.NotificationType; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; -import git4idea.Notificator; +import com.intellij.openapi.vcs.VcsNotifier; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,9 +27,6 @@ import java.awt.*; import static org.jetbrains.plugins.github.util.GithubUtil.getErrorTextFromException; -/** - * @author Aleksey Pivovarov - */ public class GithubNotifications { private static final Logger LOG = GithubUtil.LOG; @@ -39,40 +34,33 @@ public class GithubNotifications { public static void showInfo(@NotNull Project project, @NotNull String title, @NotNull String message) { LOG.info(title + "; " + message); - Notification notification = new Notification(GITHUB_NOTIFICATION_GROUP, title, message, NotificationType.INFORMATION); - Notificator.getInstance(project).notify(notification); + VcsNotifier.getInstance(project).notifyImportantInfo(title, message); } public static void showWarning(@NotNull Project project, @NotNull String title, @NotNull String message) { LOG.info(title + "; " + message); - Notification notification = new Notification(GITHUB_NOTIFICATION_GROUP, title, message, NotificationType.WARNING); - Notificator.getInstance(project).notify(notification); + VcsNotifier.getInstance(project).notifyImportantWarning(title, message); } public static void showError(@NotNull Project project, @NotNull String title, @NotNull String message) { LOG.info(title + "; " + message); - Notification notification = new Notification(GITHUB_NOTIFICATION_GROUP, title, message, NotificationType.ERROR); - Notificator.getInstance(project).notify(notification); + VcsNotifier.getInstance(project).notifyError(title, message); } public static void showError(@NotNull Project project, @NotNull String title, @NotNull String message, @NotNull String logDetails) { LOG.warn(title + "; " + message + "; " + logDetails); - Notification notification = new Notification(GITHUB_NOTIFICATION_GROUP, title, message, NotificationType.ERROR); - Notificator.getInstance(project).notify(notification); + VcsNotifier.getInstance(project).notifyError(title, message); } public static void showError(@NotNull Project project, @NotNull String title, @NotNull Exception e) { LOG.warn(title + "; ", e); - Notification notification = new Notification(GITHUB_NOTIFICATION_GROUP, title, getErrorTextFromException(e), NotificationType.ERROR); - Notificator.getInstance(project).notify(notification); + VcsNotifier.getInstance(project).notifyError(title, getErrorTextFromException(e)); } public static void showInfoURL(@NotNull Project project, @NotNull String title, @NotNull String message, @NotNull String url) { LOG.info(title + "; " + message + "; " + url); - Notification notification = - new Notification(GITHUB_NOTIFICATION_GROUP, title, "<a href='" + url + "'>" + message + "</a>", NotificationType.INFORMATION, - NotificationListener.URL_OPENING_LISTENER); - Notificator.getInstance(project).notify(notification); + VcsNotifier.getInstance(project) + .notifyImportantInfo(title, "<a href='" + url + "'>" + message + "</a>", NotificationListener.URL_OPENING_LISTENER); } public static void showWarningURL(@NotNull Project project, @@ -82,10 +70,8 @@ public class GithubNotifications { @NotNull String postfix, @NotNull String url) { LOG.info(title + "; " + prefix + highlight + postfix + "; " + url); - Notification notification = - new Notification(GITHUB_NOTIFICATION_GROUP, title, prefix + "<a href='" + url + "'>" + highlight + "</a>" + postfix, - NotificationType.WARNING, NotificationListener.URL_OPENING_LISTENER); - Notificator.getInstance(project).notify(notification); + VcsNotifier.getInstance(project).notifyImportantWarning(title, prefix + "<a href='" + url + "'>" + highlight + "</a>" + postfix, + NotificationListener.URL_OPENING_LISTENER); } public static void showErrorURL(@NotNull Project project, @@ -95,10 +81,8 @@ public class GithubNotifications { @NotNull String postfix, @NotNull String url) { LOG.info(title + "; " + prefix + highlight + postfix + "; " + url); - Notification notification = - new Notification(GITHUB_NOTIFICATION_GROUP, title, prefix + "<a href='" + url + "'>" + highlight + "</a>" + postfix, - NotificationType.ERROR, NotificationListener.URL_OPENING_LISTENER); - Notificator.getInstance(project).notify(notification); + VcsNotifier.getInstance(project).notifyError(title, prefix + "<a href='" + url + "'>" + highlight + "</a>" + postfix, + NotificationListener.URL_OPENING_LISTENER); } public static void showInfoDialog(final @Nullable Project project, final @NotNull String title, final @NotNull String message) { diff --git a/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java b/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java index 1f7635d35601..53582045c929 100644 --- a/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java +++ b/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java @@ -19,7 +19,9 @@ import com.intellij.notification.Notification; import com.intellij.notification.NotificationType; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; +import com.intellij.openapi.vcs.TestVcsNotifier; import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.UsefulTestCase; @@ -28,7 +30,6 @@ import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory; import git4idea.DialogManager; import git4idea.GitUtil; -import git4idea.Notificator; import git4idea.commands.GitHttpAuthService; import git4idea.commands.GitHttpAuthenticator; import git4idea.config.GitConfigUtil; @@ -39,7 +40,6 @@ import git4idea.repo.GitRepositoryManager; import git4idea.test.GitExecutor; import git4idea.test.GitTestUtil; import git4idea.test.TestDialogManager; -import git4idea.test.TestNotificator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.github.util.GithubAuthData; @@ -63,7 +63,6 @@ import static org.junit.Assume.assumeNotNull; * idea.test.github.password=mypassword</code> // password for test user * </p> * - * @author Kirill Likhodedov */ public abstract class GithubTest extends UsefulTestCase { @@ -77,7 +76,7 @@ public abstract class GithubTest extends UsefulTestCase { @NotNull private GitHttpAuthTestService myHttpAuthService; @NotNull protected TestDialogManager myDialogManager; - @NotNull protected TestNotificator myNotificator; + @NotNull protected TestVcsNotifier myVcsNotifier; @NotNull private IdeaProjectTestFixture myProjectFixture; @@ -104,7 +103,7 @@ public abstract class GithubTest extends UsefulTestCase { } protected void checkNotification(@NotNull NotificationType type, @Nullable String title, @Nullable String content) { - Notification actualNotification = myNotificator.getLastNotification(); + Notification actualNotification = myVcsNotifier.getLastNotification(); assertNotNull("No notification was shown", actualNotification); if (title != null) { @@ -213,7 +212,7 @@ public abstract class GithubTest extends UsefulTestCase { myGitHubSettings.setAuthData(myAuth, false); myDialogManager = (TestDialogManager)ServiceManager.getService(DialogManager.class); - myNotificator = (TestNotificator)ServiceManager.getService(myProject, Notificator.class); + myVcsNotifier = (TestVcsNotifier)ServiceManager.getService(myProject, VcsNotifier.class); myHttpAuthService = (GitHttpAuthTestService)ServiceManager.getService(GitHttpAuthService.class); myGitRepositoryManager = GitUtil.getRepositoryManager(myProject); @@ -240,7 +239,7 @@ public abstract class GithubTest extends UsefulTestCase { finally { myHttpAuthService.cleanup(); myDialogManager.cleanup(); - myNotificator.cleanup(); + myVcsNotifier.cleanup(); myProjectFixture.tearDown(); super.tearDown(); diff --git a/plugins/gradle/src/META-INF/gradle-scala-integration.xml b/plugins/gradle/src/META-INF/gradle-scala-integration.xml deleted file mode 100644 index 707d61670f1a..000000000000 --- a/plugins/gradle/src/META-INF/gradle-scala-integration.xml +++ /dev/null @@ -1,5 +0,0 @@ -<idea-plugin> - <extensions defaultExtensionNs="org.jetbrains.plugins.gradle"> - <projectResolve implementation="org.jetbrains.plugins.gradle.integrations.scala.ScalaGradleProjectResolverExtension"/> - </extensions> -</idea-plugin> diff --git a/plugins/gradle/src/META-INF/plugin.xml b/plugins/gradle/src/META-INF/plugin.xml index d944e82ed36f..72fa9e765c7d 100644 --- a/plugins/gradle/src/META-INF/plugin.xml +++ b/plugins/gradle/src/META-INF/plugin.xml @@ -41,7 +41,6 @@ <depends>org.intellij.groovy</depends> <depends optional="true" config-file="gradle-javaee-plugin.xml">com.intellij.javaee</depends> <depends optional="true" config-file="gradle-maven-integration.xml">org.jetbrains.idea.maven</depends> - <depends optional="true" config-file="gradle-scala-integration.xml">org.intellij.scala</depends> <extensionPoints> <extensionPoint name="projectResolve" interface="org.jetbrains.plugins.gradle.service.project.GradleProjectResolverExtension"/> @@ -63,6 +62,7 @@ <resolve.contributor implementation="org.jetbrains.plugins.gradle.service.resolve.GradleSourceSetsContributor"/> <resolve.contributor implementation="org.jetbrains.plugins.gradle.service.resolve.GradleImplicitContributor"/> <projectResolve implementation="org.jetbrains.plugins.gradle.service.project.BaseGradleProjectResolverExtension"/> + <projectResolve implementation="org.jetbrains.plugins.gradle.integrations.scala.ScalaGradleProjectResolverExtension"/> </extensions> <extensions defaultExtensionNs="com.intellij"> diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/scala/ScalaGradleProjectResolverExtension.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/scala/ScalaGradleProjectResolverExtension.java index 657d064e2886..1b5df1420a2d 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/scala/ScalaGradleProjectResolverExtension.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/scala/ScalaGradleProjectResolverExtension.java @@ -31,6 +31,7 @@ import org.jetbrains.plugins.gradle.model.data.ScalaCompileOptionsData; import org.jetbrains.plugins.gradle.model.data.ScalaModelData; import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension; import org.jetbrains.plugins.gradle.util.GradleConstants; +import org.jetbrains.plugins.gradle.util.GradleUtil; import java.util.Collections; import java.util.Set; @@ -43,8 +44,12 @@ import java.util.Set; public class ScalaGradleProjectResolverExtension extends AbstractProjectResolverExtension { private static final Logger LOG = Logger.getInstance(ScalaGradleProjectResolverExtension.class); + private static final boolean scalaPluginPresent = GradleUtil.isPluginPresent("org.intellij.scala"); + @Override public void populateModuleExtraModels(@NotNull IdeaModule gradleModule, @NotNull DataNode<ModuleData> ideModule) { + if (!scalaPluginPresent) return; + ScalaModel scalaModel = resolverCtx.getExtraProject(gradleModule, ScalaModel.class); if (scalaModel != null) { ScalaModelData scalaModelData = create(scalaModel); @@ -57,7 +62,7 @@ public class ScalaGradleProjectResolverExtension extends AbstractProjectResolver @NotNull @Override public Set<Class> getExtraProjectModelClasses() { - return Collections.<Class>singleton(ScalaModel.class); + return scalaPluginPresent ? Collections.<Class>singleton(ScalaModel.class) : Collections.<Class>emptySet(); } diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java index fb0ba0ac37e3..d5750d5987c8 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java @@ -1,7 +1,11 @@ package org.jetbrains.plugins.gradle.util; import com.intellij.ide.actions.OpenProjectFileChooserDescriptor; +import com.intellij.ide.plugins.IdeaPluginDescriptor; +import com.intellij.ide.plugins.PluginManager; +import com.intellij.ide.plugins.PluginManagerCore; import com.intellij.ide.util.PropertiesComponent; +import com.intellij.openapi.extensions.PluginId; import com.intellij.openapi.externalSystem.model.ExternalSystemException; import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil; import com.intellij.openapi.externalSystem.util.ExternalSystemConstants; @@ -243,4 +247,12 @@ public class GradleUtil { public static String createJvmArg(@NotNull String name, @NotNull String value) { return String.format(JVM_ARG_FORMAT, name, value); } + + public static boolean isPluginPresent(@NotNull String id) { + PluginId pluginId = PluginId.getRegisteredIds().get(id); + if (pluginId == null) return false; + IdeaPluginDescriptor pluginDescriptor = PluginManager.getPlugin(pluginId); + if (pluginDescriptor == null) return false; + return !PluginManagerCore.shouldSkipPlugin(pluginDescriptor); + } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrReferenceHighlighter.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrReferenceHighlighter.java index 4d23980e30ac..78ae905b5850 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrReferenceHighlighter.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrReferenceHighlighter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -67,29 +67,26 @@ public class GrReferenceHighlighter extends TextEditorHighlightingPass { final TextAttributesKey attribute = GrHighlightUtil.getDeclarationHighlightingAttribute(variable, null); if (attribute != null) { final PsiElement nameElement = variable.getNameIdentifierGroovy(); - assert myInfos != null; - HighlightInfo.Builder builder = HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).range(nameElement); - HighlightInfo info = builder.needsUpdateOnTyping(false).textAttributes(attribute).create(); - if (info != null) { - myInfos.add(info); - } + addInfo(attribute, nameElement); } } } - private void visit(GrReferenceElement element) { ProgressManager.checkCanceled(); final PsiElement resolved = element.resolve(); final TextAttributesKey attribute = GrHighlightUtil.getDeclarationHighlightingAttribute(resolved, element); if (attribute != null) { final PsiElement refNameElement = GrHighlightUtil.getElementToHighlight(element); - assert myInfos != null; - HighlightInfo.Builder builder = HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).range(refNameElement); - HighlightInfo info = builder.needsUpdateOnTyping(false).textAttributes(attribute).create(); - if (info != null) { - myInfos.add(info); - } + addInfo(attribute, refNameElement); + } + } + + private void addInfo(TextAttributesKey attribute, PsiElement nameElement) { + assert myInfos != null; + HighlightInfo info = HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).range(nameElement).needsUpdateOnTyping(false).textAttributes(attribute).create(); + if (info != null) { + myInfos.add(info); } } }; @@ -100,10 +97,10 @@ public class GrReferenceHighlighter extends TextEditorHighlightingPass { final int size = myInfos.size(); super.visitReferenceExpression(referenceExpression); if (size == myInfos.size()) { - HighlightInfo info = GrUnresolvedAccessInspection.checkReferenceExpression(referenceExpression); - if (info != null) { + List<HighlightInfo> infos = GrUnresolvedAccessInspection.checkReferenceExpression(referenceExpression); + if (infos != null) { assert myInfos != null; - myInfos.add(info); + myInfos.addAll(infos); } } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java index 4f7ebf4bbcd4..a53647ea40ec 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java @@ -1493,13 +1493,13 @@ public class GroovyAnnotator extends GroovyElementVisitor { } @Override - public void visitDefaultAnnotationValue(GrDefaultAnnotationValue defaultAnnotationValue) { - final GrAnnotationMemberValue value = defaultAnnotationValue.getDefaultValue(); + public void visitAnnotationMethod(GrAnnotationMethod annotationMethod) { + super.visitAnnotationMethod(annotationMethod); + + final GrAnnotationMemberValue value = annotationMethod.getDefaultValue(); if (value == null) return; - final PsiElement parent = defaultAnnotationValue.getParent(); - assert parent instanceof GrAnnotationMethod; - final PsiType type = ((GrAnnotationMethod)parent).getReturnType(); + final PsiType type = annotationMethod.getReturnType(); Map<PsiElement, String> errors = ContainerUtil.newHashMap(); CustomAnnotationChecker.checkAnnotationValueByType(errors, value, type, false); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java index d5b5132f0b9e..8b17f9c4d047 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -31,6 +31,7 @@ import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.PsiShortNamesCache; import com.intellij.psi.util.PsiFormatUtil; +import com.intellij.psi.util.PsiFormatUtilBase; import com.intellij.psi.util.proximity.PsiProximityComparator; import com.intellij.ui.components.JBList; import com.intellij.util.IncorrectOperationException; @@ -65,7 +66,7 @@ public class GroovyStaticImportMethodFix extends Intention { public String getText() { String text = "Static Import Method"; if (getCandidates().size() == 1) { - final int options = PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_CONTAINING_CLASS | PsiFormatUtil.SHOW_FQ_NAME; + final int options = PsiFormatUtilBase.SHOW_NAME | PsiFormatUtilBase.SHOW_CONTAINING_CLASS | PsiFormatUtilBase.SHOW_FQ_NAME; text += " '" + PsiFormatUtil.formatMethod(getCandidates().get(0), PsiSubstitutor.EMPTY, options, 0) + "'"; } else { @@ -87,8 +88,7 @@ public class GroovyStaticImportMethodFix extends Intention { public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { myCandidates = null; - return myMethodCall != null && - myMethodCall.getElement() != null && + return myMethodCall.getElement() != null && myMethodCall.getElement().isValid() && getMethodExpression(myMethodCall.getElement()) != null && getMethodExpression(myMethodCall.getElement()).getQualifierExpression() == null && diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GrUnresolvedAccessInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GrUnresolvedAccessInspection.java index 7259fa7cff67..6b58f99d0ddc 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GrUnresolvedAccessInspection.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GrUnresolvedAccessInspection.java @@ -88,6 +88,9 @@ import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil; import org.jetbrains.plugins.groovy.util.LightCacheKey; import javax.swing.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import java.util.Map; import static com.intellij.psi.PsiModifier.STATIC; @@ -173,9 +176,9 @@ public class GrUnresolvedAccessInspection extends GroovySuppressableInspectionTo } @Nullable - public static HighlightInfo checkReferenceExpression(GrReferenceExpression ref) { - HighlightInfo info = checkRefInner(ref); - addEmptyIntentionIfNeeded(info); + public static List<HighlightInfo> checkReferenceExpression(GrReferenceExpression ref) { + List<HighlightInfo> info = checkRefInner(ref); + addEmptyIntentionIfNeeded(ContainerUtil.getFirstItem(info)); return info; } @@ -251,7 +254,7 @@ public class GrUnresolvedAccessInspection extends GroovySuppressableInspectionTo } @Nullable - private static HighlightInfo checkRefInner(GrReferenceExpression ref) { + private static List<HighlightInfo> checkRefInner(GrReferenceExpression ref) { PsiElement refNameElement = ref.getReferenceNameElement(); if (refNameElement == null) return null; @@ -263,7 +266,7 @@ public class GrUnresolvedAccessInspection extends GroovySuppressableInspectionTo if (!isStaticOk(resolveResult)) { String message = GroovyBundle.message("cannot.reference.non.static", ref.getReferenceName()); - return createAnnotationForRef(ref, inStaticContext, message); + return Collections.singletonList(createAnnotationForRef(ref, inStaticContext, message)); } return null; @@ -288,9 +291,11 @@ public class GrUnresolvedAccessInspection extends GroovySuppressableInspectionTo HighlightInfo info = createAnnotationForRef(ref, inStaticContext, GroovyBundle.message("cannot.resolve", ref.getReferenceName())); if (info == null) return null; + ArrayList<HighlightInfo> result = ContainerUtil.newArrayList(); + result.add(info); HighlightDisplayKey displayKey = HighlightDisplayKey.find(SHORT_NAME); if (ref.getParent() instanceof GrMethodCall) { - registerStaticImportFix(ref, info, displayKey); + ContainerUtil.addIfNotNull(result, registerStaticImportFix(ref, displayKey)); } else { registerCreateClassByTypeFix(ref, info, displayKey); @@ -300,7 +305,7 @@ public class GrUnresolvedAccessInspection extends GroovySuppressableInspectionTo registerReferenceFixes(ref, info, inStaticContext, displayKey); UnresolvedReferenceQuickFixProvider.registerReferenceFixes(ref, new QuickFixActionRegistrarAdapter(info, displayKey)); OrderEntryFix.registerFixes(new QuickFixActionRegistrarAdapter(info, displayKey), ref); - return info; + return result; } return null; @@ -534,14 +539,16 @@ public class GrUnresolvedAccessInspection extends GroovySuppressableInspectionTo return HighlightInfo.newHighlightInfo(highlightInfoType).range(refNameElement).descriptionAndTooltip(message).create(); } - private static void registerStaticImportFix(@NotNull GrReferenceExpression referenceExpression, - @Nullable HighlightInfo info, - @Nullable final HighlightDisplayKey key) { + private static HighlightInfo registerStaticImportFix(@NotNull GrReferenceExpression referenceExpression, + @Nullable final HighlightDisplayKey key) { final String referenceName = referenceExpression.getReferenceName(); - if (StringUtil.isEmpty(referenceName)) return; - if (referenceExpression.getQualifier() != null) return; + if (StringUtil.isEmpty(referenceName)) return null; + if (referenceExpression.getQualifier() != null) return null; + HighlightInfo info = HighlightInfo.newHighlightInfo(HighlightInfoType.INFORMATION).range( + referenceExpression.getParent()).createUnconditionally(); QuickFixAction.registerQuickFixAction(info, new GroovyStaticImportMethodFix((GrMethodCall)referenceExpression.getParent()), key); + return info; } private static void registerReferenceFixes(GrReferenceExpression refExpr, diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapper.java index 583cbaa094c4..9ab7c094464f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapper.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapper.java @@ -41,7 +41,7 @@ public class GroovyHotSwapper extends JavaProgramPatcher { private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.debugger.GroovyHotSwapper"); private static final String GROOVY_HOTSWAP_AGENT_PATH = "groovy.hotswap.agent.path"; - private static final Pattern SPRING_LOADED_PATTERN = Pattern.compile("-javaagent:.+springloaded-core-[^/\\\\]+\\.jar"); + private static final Pattern SPRING_LOADED_PATTERN = Pattern.compile("-javaagent:.+springloaded-[^/\\\\]+\\.jar"); private static boolean containsGroovyClasses(final Project project) { return CachedValuesManager.getManager(project).getCachedValue(project, new CachedValueProvider<Boolean>() { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManagerFactory.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManagerFactory.java index 12aaf2a53bad..200390323ba9 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManagerFactory.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManagerFactory.java @@ -18,13 +18,14 @@ package org.jetbrains.plugins.groovy.debugger; import com.intellij.debugger.PositionManager; import com.intellij.debugger.PositionManagerFactory; import com.intellij.debugger.engine.DebugProcess; +import org.jetbrains.annotations.NotNull; /** * @author peter */ public class GroovyPositionManagerFactory extends PositionManagerFactory { @Override - public PositionManager createPositionManager(DebugProcess process) { + public PositionManager createPositionManager(@NotNull DebugProcess process) { return new GroovyPositionManager(process); } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyIndentProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyIndentProcessor.java index c81df59cd7fa..b004679e8fb9 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyIndentProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyIndentProcessor.java @@ -36,10 +36,7 @@ import org.jetbrains.plugins.groovy.lang.psi.GroovyFileBase; import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement; import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.GrListOrMap; import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.GrThrowsClause; -import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotation; -import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationArgumentList; -import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationArrayInitializer; -import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationNameValuePair; +import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.*; import org.jetbrains.plugins.groovy.lang.psi.api.statements.*; import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList; import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrNamedArgument; @@ -55,6 +52,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrExtendsCla import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrImplementsClause; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinitionBody; +import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrAnnotationMethod; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod; import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement; import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeArgumentList; @@ -407,8 +405,13 @@ public class GroovyIndentProcessor extends GroovyElementVisitor { } @Override - public void visitDefaultAnnotationValue(GrDefaultAnnotationValue defaultAnnotationValue) { - myResult = Indent.getContinuationIndent(); + public void visitAnnotationMethod(GrAnnotationMethod annotationMethod) { + if (myChild instanceof GrAnnotationMemberValue) { + myResult = Indent.getContinuationIndent(); + } + else { + super.visitAnnotationMethod(annotationMethod); + } } @Override diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessor.java index e64154c3a14b..fd2e9bd42516 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessor.java @@ -69,6 +69,7 @@ import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil; import static org.jetbrains.plugins.groovy.GroovyFileType.GROOVY_LANGUAGE; import static org.jetbrains.plugins.groovy.formatter.models.spacing.SpacingTokens.*; import static org.jetbrains.plugins.groovy.formatter.models.spacing.SpacingTokens.GROOVY_DOC_COMMENT; +import static org.jetbrains.plugins.groovy.formatter.models.spacing.SpacingTokens.kDEFAULT; import static org.jetbrains.plugins.groovy.formatter.models.spacing.SpacingTokens.kIN; import static org.jetbrains.plugins.groovy.formatter.models.spacing.SpacingTokens.mCOMMA; import static org.jetbrains.plugins.groovy.formatter.models.spacing.SpacingTokens.mELVIS; @@ -684,7 +685,7 @@ public class GroovySpacingProcessor extends GroovyElementVisitor { @Override public void visitAnnotationMethod(GrAnnotationMethod annotationMethod) { - if (myType2 == DEFAULT_ANNOTATION_VALUE) { + if (myType2 == kDEFAULT) { createSpaceInCode(true); } else { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ImportStaticIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ImportStaticIntention.java index c5bea4a6709a..7bccfea8a963 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ImportStaticIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ImportStaticIntention.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -23,13 +23,17 @@ import com.intellij.psi.search.LocalSearchScope; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.plugins.groovy.codeStyle.GrReferenceAdjuster; import org.jetbrains.plugins.groovy.intentions.base.Intention; import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; import org.jetbrains.plugins.groovy.lang.psi.GrQualifiedReference; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory; import org.jetbrains.plugins.groovy.lang.psi.GroovyRecursiveElementVisitor; +import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; +import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrMethodCall; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression; import org.jetbrains.plugins.groovy.lang.psi.api.toplevel.imports.GrImportStatement; import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeArgumentList; @@ -41,27 +45,19 @@ public class ImportStaticIntention extends Intention { private static final Key<PsiElement> TEMP_REFERENT_USER_DATA = new Key<PsiElement>("TEMP_REFERENT_USER_DATA"); @Override - protected void processIntention(@NotNull PsiElement element, final Project project, final Editor editor) - throws IncorrectOperationException { - final PsiElement resolved; - final String name; - final GroovyFile file; - final GrImportStatement importStatement; - boolean isAnythingShortened; - if (!(element instanceof GrReferenceExpression)) return; - final GrReferenceExpression ref = (GrReferenceExpression)element; - resolved = ref.resolve(); + protected void processIntention(@NotNull PsiElement element, final Project project, final Editor editor) throws IncorrectOperationException { + final PsiElement resolved = resolve(element); if (!(resolved instanceof PsiMember)) return; final PsiClass containingClass = ((PsiMember)resolved).getContainingClass(); if (containingClass == null) return; final String qname = containingClass.getQualifiedName(); - name = ((PsiMember)resolved).getName(); + final String name = ((PsiMember)resolved).getName(); if (name == null) return; final PsiFile containingFile = element.getContainingFile(); if (!(containingFile instanceof GroovyFile)) return; - file = (GroovyFile)containingFile; + final GroovyFile file = (GroovyFile)containingFile; file.accept(new GroovyRecursiveElementVisitor() { @Override public void visitReferenceExpression(GrReferenceExpression expression) { @@ -77,17 +73,9 @@ public class ImportStaticIntention extends Intention { final GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(project); final GrImportStatement tempImport = factory.createImportStatementFromText(qname + "." + name, true, false, null); - importStatement = file.addImport(tempImport); - - isAnythingShortened = false; - for (PsiReference reference : ReferencesSearch.search(resolved, new LocalSearchScope(containingFile))) { - final PsiElement refElement = reference.getElement(); - if (refElement instanceof GrQualifiedReference<?>) { - isAnythingShortened |= - org.jetbrains.plugins.groovy.codeStyle.GrReferenceAdjuster.shortenReference((GrQualifiedReference<?>)refElement); - } - } + final GrImportStatement importStatement = file.addImport(tempImport); + boolean isAnythingShortened = shortenUsages(resolved, containingFile); if (!isAnythingShortened) { importStatement.delete(); return; @@ -111,7 +99,7 @@ public class ImportStaticIntention extends Intention { if (qualifier instanceof GrReferenceExpression) { PsiElement aClass = ((GrReferenceExpression)qualifier).resolve(); if (aClass == ((PsiMember)resolved).getContainingClass()) { - org.jetbrains.plugins.groovy.codeStyle.GrReferenceAdjuster.shortenReference(expression); + GrReferenceAdjuster.shortenReference(expression); } } } @@ -129,6 +117,18 @@ public class ImportStaticIntention extends Intention { }); } + private static boolean shortenUsages(PsiElement resolved, PsiFile containingFile) { + boolean isAnythingShortened = false; + for (PsiReference reference : ReferencesSearch.search(resolved, new LocalSearchScope(containingFile))) { + final PsiElement refElement = reference.getElement(); + if (refElement instanceof GrQualifiedReference<?>) { + boolean shortened = GrReferenceAdjuster.shortenReference((GrQualifiedReference<?>)refElement); + isAnythingShortened |= shortened; + } + } + return isAnythingShortened; + } + @Override protected boolean isStopElement(PsiElement element) { return super.isStopElement(element) || element instanceof GrReferenceExpression; @@ -140,15 +140,39 @@ public class ImportStaticIntention extends Intention { return new PsiElementPredicate() { @Override public boolean satisfiedBy(PsiElement element) { - if (!(element instanceof GrReferenceExpression)) return false; - final GrReferenceExpression ref = (GrReferenceExpression)element; - if (ref.getQualifier() == null) return false; - final PsiElement resolved = ref.resolve(); - if (resolved == null) return false; - return resolved instanceof PsiMember && !(resolved instanceof PsiClass) && - ((PsiMember)resolved).hasModifierProperty(PsiModifier.STATIC) && - ((PsiMember)resolved).getContainingClass() != null; + final PsiElement resolved = resolve(element); + + if (resolved == null) return false; + return resolved instanceof PsiMember && !(resolved instanceof PsiClass) && + ((PsiMember)resolved).hasModifierProperty(PsiModifier.STATIC) && + ((PsiMember)resolved).getContainingClass() != null; } }; } + + @Nullable + private static PsiElement resolve(PsiElement element) { + GrReferenceExpression ref = findRef(element); + + if (ref == null || ref.getQualifier() == null) return null; + return ref.resolve(); + } + + @Nullable + private static GrReferenceExpression findRef(PsiElement element) { + if ((element instanceof GrReferenceExpression)) { + return (GrReferenceExpression)element; + + } + else if (element instanceof GrArgumentList) { + PsiElement parent = element.getParent(); + if (parent instanceof GrMethodCall) { + GrExpression invoked = ((GrMethodCall)parent).getInvokedExpression(); + if (invoked instanceof GrReferenceExpression) { + return ((GrReferenceExpression)invoked); + } + } + } + return null; + } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyAnnotationAttributeInfoHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyAnnotationAttributeInfoHandler.java index 8d6705087992..35030c19110a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyAnnotationAttributeInfoHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyAnnotationAttributeInfoHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -18,7 +18,6 @@ package org.jetbrains.plugins.groovy.lang.parameterInfo; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.lang.parameterInfo.*; import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; @@ -197,6 +196,6 @@ public class GroovyAnnotationAttributeInfoHandler implements ParameterInfoHandle } - context.setupUIComponentPresentation(StringUtil.escapeXml(buffer.toString()), highlightStartOffset, highlightEndOffset, false, p.isDeprecated(), false, context.getDefaultParameterColor()); + context.setupUIComponentPresentation(buffer.toString(), highlightStartOffset, highlightEndOffset, false, p.isDeprecated(), false, context.getDefaultParameterColor()); } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyTypeParameterInfoHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyTypeParameterInfoHandler.java index 4924d0175b33..2e54bef62d8e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyTypeParameterInfoHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyTypeParameterInfoHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -34,7 +34,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement; import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeArgumentList; import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeElement; -import java.util.Arrays; import java.util.Set; /** @@ -156,13 +155,13 @@ public class GroovyTypeParameterInfoHandler implements ParameterInfoHandlerWithT buffer.append(p.getName()); int highlightEndOffset = buffer.length(); buffer.append(" extends "); - buffer.append(StringUtil.join(Arrays.asList(p.getSuperTypes()), new Function<PsiClassType, String>() { - @Override - public String fun(final PsiClassType t) { - return t.getPresentableText(); - } - }, ", ")); - - context.setupUIComponentPresentation(StringUtil.escapeXml(buffer.toString()), 0, highlightEndOffset, false, false, false, context.getDefaultParameterColor()); + buffer.append(StringUtil.join(p.getSuperTypes(), new Function<PsiClassType, String>() { + @Override + public String fun(final PsiClassType t) { + return t.getPresentableText(); + } + }, ", ")); + + context.setupUIComponentPresentation(buffer.toString(), 0, highlightEndOffset, false, false, false, context.getDefaultParameterColor()); } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/GroovyPsiCreator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/GroovyPsiCreator.java index a071bd23a3f5..a7f0524baddd 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/GroovyPsiCreator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/GroovyPsiCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -104,8 +104,6 @@ public class GroovyPsiCreator implements GroovyElementTypes { if (elem == ANNOTATION_ARRAY_INITIALIZER) return new GrAnnotationArrayInitializerImpl(node); if (elem == ANNOTATION_MEMBER_VALUE_PAIR) return new GrAnnotationNameValuePairImpl(node); - if (elem == DEFAULT_ANNOTATION_VALUE) return new GrDefaultAnnotationValueImpl(node); - //throws if (elem == THROW_CLAUSE) return new GrThrowsClauseImpl(node); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/declaration/VariableDefinitions.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/declaration/VariableDefinitions.java index 80d0ee6c32a7..fa4db282a732 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/declaration/VariableDefinitions.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/declaration/VariableDefinitions.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -152,15 +152,12 @@ public class VariableDefinitions implements GroovyElementTypes { } if (isAnnotationMember && builder.getTokenType() == kDEFAULT) { - PsiBuilder.Marker defaultValueMarker = builder.mark(); ParserUtils.getToken(builder, kDEFAULT); ParserUtils.getToken(builder, mNLS); if (!AnnotationArguments.parseAnnotationMemberValueInitializer(builder, parser)) { builder.error(GroovyBundle.message("annotation.initializer.expected")); } - - defaultValueMarker.done(DEFAULT_ANNOTATION_VALUE); } if (ParserUtils.lookAhead(builder, mNLS, kTHROWS) || ParserUtils.lookAhead(builder, mNLS, mLCURLY)) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyElementVisitor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyElementVisitor.java index c548b56eafdd..bf65baa23c6e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyElementVisitor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyElementVisitor.java @@ -296,10 +296,6 @@ public abstract class GroovyElementVisitor { visitMethod(annotationMethod); } - public void visitDefaultAnnotationValue(GrDefaultAnnotationValue defaultAnnotationValue) { - visitElement(defaultAnnotationValue); - } - public void visitMethod(GrMethod method) { visitElement(method); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrDefaultAnnotationValue.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrDefaultAnnotationValue.java deleted file mode 100644 index 84bd256cc2d0..000000000000 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrDefaultAnnotationValue.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2000-2009 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 org.jetbrains.plugins.groovy.lang.psi.api.statements; - -import com.intellij.psi.PsiAnnotationMemberValue; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement; -import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationMemberValue; - -/** - * User: Dmitry.Krasilschikov - * Date: 04.06.2007 - */ -public interface GrDefaultAnnotationValue extends GroovyPsiElement, PsiAnnotationMemberValue { - @Nullable - GrAnnotationMemberValue getDefaultValue(); -} diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/members/GrAnnotationMethod.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/members/GrAnnotationMethod.java index be21a511ea31..255abd0339e3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/members/GrAnnotationMethod.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/members/GrAnnotationMethod.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -17,13 +17,14 @@ package org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members; import com.intellij.psi.PsiAnnotationMethod; import org.jetbrains.annotations.Nullable; -import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrDefaultAnnotationValue; +import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationMemberValue; /** * User: Dmitry.Krasilschikov * Date: 04.06.2007 */ public interface GrAnnotationMethod extends GrMethod, PsiAnnotationMethod { + @Nullable - GrDefaultAnnotationValue getDefaultValue(); + GrAnnotationMemberValue getDefaultValue(); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/expectedTypes/GroovyExpectedTypesProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/expectedTypes/GroovyExpectedTypesProvider.java index 1d541a0b83c2..bc48bb2a043a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/expectedTypes/GroovyExpectedTypesProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/expectedTypes/GroovyExpectedTypesProvider.java @@ -205,9 +205,7 @@ public class GroovyExpectedTypesProvider { } @Override - public void visitDefaultAnnotationValue(GrDefaultAnnotationValue defaultAnnotationValue) { - final GrAnnotationMethod method = ((GrAnnotationMethod)defaultAnnotationValue.getParent()); - + public void visitAnnotationMethod(GrAnnotationMethod method) { PsiType type = method.getReturnType(); if (type != null && isAcceptableAnnotationValueType(type)) { myResult = createSimpleSubTypeResult(type); @@ -216,7 +214,7 @@ public class GroovyExpectedTypesProvider { @Override public void visitAnnotationArrayInitializer(GrAnnotationArrayInitializer arrayInitializer) { - final GrAnnotationNameValuePair nameValuePair = PsiTreeUtil.getParentOfType(arrayInitializer, GrAnnotationNameValuePair.class, true, GrDefaultAnnotationValue.class); + final GrAnnotationNameValuePair nameValuePair = PsiTreeUtil.getParentOfType(arrayInitializer, GrAnnotationNameValuePair.class, true, GrAnnotationMethod.class); if (nameValuePair != null) { final PsiClass annot = ResolveUtil.resolveAnnotation(arrayInitializer); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrDefaultAnnotationValueImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrDefaultAnnotationValueImpl.java deleted file mode 100644 index cb878623a383..000000000000 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrDefaultAnnotationValueImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2000-2009 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 org.jetbrains.plugins.groovy.lang.psi.impl.statements; - -import com.intellij.lang.ASTNode; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor; -import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationMemberValue; -import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrDefaultAnnotationValue; -import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyPsiElementImpl; - -/** - * User: Dmitry.Krasilschikov - * Date: 04.06.2007 - */ -public class GrDefaultAnnotationValueImpl extends GroovyPsiElementImpl implements GrDefaultAnnotationValue { - - public GrDefaultAnnotationValueImpl(@NotNull ASTNode node) { - super(node); - } - - public void accept(GroovyElementVisitor visitor) { - visitor.visitDefaultAnnotationValue(this); - } - - public String toString() { - return "Default annotation value"; - } - - @Override - public GrAnnotationMemberValue getDefaultValue() { - return findChildByClass(GrAnnotationMemberValue.class); - } -} diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationImpl.java index 6e312234decb..e1ef4491d27b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationImpl.java @@ -242,6 +242,11 @@ public class GrVariableDeclarationImpl extends GrStubElementBase<EmptyStub> impl public Object[] getVariants() { return EMPTY_ARRAY; } + + @Override + public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOperationException { + return getElement(); + } }; } else { @@ -257,6 +262,11 @@ public class GrVariableDeclarationImpl extends GrStubElementBase<EmptyStub> impl public Object[] getVariants() { return EMPTY_ARRAY; } + + @Override + public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOperationException { + return getElement(); + } }; } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrAnnotationMethodImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrAnnotationMethodImpl.java index 2286e4a59b6b..69f345555c84 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrAnnotationMethodImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrAnnotationMethodImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.extensions.NamedArgumentDescriptor; import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes; import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor; -import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrDefaultAnnotationValue; +import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationMemberValue; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrAnnotationMethod; import org.jetbrains.plugins.groovy.lang.psi.stubs.GrMethodStub; @@ -54,7 +54,7 @@ public class GrAnnotationMethodImpl extends GrMethodBaseImpl implements GrAnnota } @Override - public GrDefaultAnnotationValue getDefaultValue() { - return findChildByClass(GrDefaultAnnotationValue.class); + public GrAnnotationMemberValue getDefaultValue() { + return findChildByClass(GrAnnotationMemberValue.class); } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/toplevel/imports/GrImportStatementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/toplevel/imports/GrImportStatementImpl.java index 761cbeb31b6c..03e8016f08bf 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/toplevel/imports/GrImportStatementImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/toplevel/imports/GrImportStatementImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -25,7 +25,6 @@ import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.util.CachedValueProvider; import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.PsiModificationTracker; -import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.ObjectUtils; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -78,7 +77,7 @@ public class GrImportStatementImpl extends GrStubElementBase<GrImportStatementSt @NotNull ResolveState state, @Nullable PsiElement lastParent, @NotNull PsiElement place) { - if (PsiTreeUtil.isAncestor(this, place, false)) { + if (isAncestor(place)) { return true; } if (isStatic() && lastParent instanceof GrImportStatement) return true; @@ -93,6 +92,15 @@ public class GrImportStatementImpl extends GrStubElementBase<GrImportStatementSt return true; } + private boolean isAncestor(@Nullable PsiElement place) { + while (place instanceof GrCodeReferenceElement) { + PsiElement parent = place.getParent(); + if (parent == this) return true; + place = parent; + } + return false; + } + private boolean processDeclarationsForSingleElement(PsiScopeProcessor processor, ResolveState state) { String name = getImportedName(); if (name == null) return true; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassItemGeneratorImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassItemGeneratorImpl.java index bf29ed895839..aa3c11df8022 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassItemGeneratorImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassItemGeneratorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -32,7 +32,6 @@ import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory; import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult; import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationMemberValue; import org.jetbrains.plugins.groovy.lang.psi.api.signatures.GrClosureSignature; -import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrDefaultAnnotationValue; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrStatement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariableDeclaration; @@ -139,13 +138,10 @@ public class ClassItemGeneratorImpl implements ClassItemGenerator { GenerationUtil.writeParameterList(builder, method.getParameterList().getParameters(), classNameProvider, context); if (method instanceof GrAnnotationMethod) { - GrDefaultAnnotationValue defaultAnnotationValue = ((GrAnnotationMethod)method).getDefaultValue(); - if (defaultAnnotationValue!=null) { + GrAnnotationMemberValue defaultValue = ((GrAnnotationMethod)method).getDefaultValue(); + if (defaultValue != null) { builder.append("default "); - GrAnnotationMemberValue defaultValue = defaultAnnotationValue.getDefaultValue(); - if (defaultValue != null) { - defaultValue.accept(new AnnotationGenerator(builder, context)); - } + defaultValue.accept(new AnnotationGenerator(builder, context)); } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/springloaded/SpringLoadedPositionManagerFactory.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/springloaded/SpringLoadedPositionManagerFactory.java index a3a9611a85ea..11b1badda2b9 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/springloaded/SpringLoadedPositionManagerFactory.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/springloaded/SpringLoadedPositionManagerFactory.java @@ -6,6 +6,7 @@ import com.intellij.debugger.engine.DebugProcess; import com.intellij.openapi.application.AccessToken; import com.intellij.openapi.application.ApplicationManager; import com.intellij.psi.JavaPsiFacade; +import org.jetbrains.annotations.NotNull; /** * Factory for position manager to debug classes reloaded by com.springsource.springloaded @@ -14,7 +15,7 @@ import com.intellij.psi.JavaPsiFacade; public class SpringLoadedPositionManagerFactory extends PositionManagerFactory { @Override - public PositionManager createPositionManager(final DebugProcess process) { + public PositionManager createPositionManager(@NotNull final DebugProcess process) { AccessToken accessToken = ApplicationManager.getApplication().acquireReadActionLock(); try { JavaPsiFacade facade = JavaPsiFacade.getInstance(process.getProject()); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy index 0405449ee0f5..0b6f00de9d2e 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy @@ -1789,4 +1789,15 @@ public class Bar3 { } ''') } + void testImportStaticFix() { + myFixture.configureByText('a.groovy', ''' +class A { + static void foo(String s){} +} + +foo(<caret>) +''') + + myFixture.getAvailableIntention("Static Import Method 'A.foo'") + } }
\ No newline at end of file diff --git a/plugins/groovy/testdata/parsing/groovy/types/ann_def3.test b/plugins/groovy/testdata/parsing/groovy/types/ann_def3.test index 026b3d40209c..4c35706139e2 100644 --- a/plugins/groovy/testdata/parsing/groovy/types/ann_def3.test +++ b/plugins/groovy/testdata/parsing/groovy/types/ann_def3.test @@ -31,14 +31,13 @@ Groovy script <empty list> PsiElement())(')') PsiWhiteSpace(' ') - Default annotation value - PsiElement(default)('default') - PsiWhiteSpace(' ') - Annotation array initializer - PsiElement([)('[') - Literal - PsiElement(Integer)('8') - PsiElement(])(']') + PsiElement(default)('default') + PsiWhiteSpace(' ') + Annotation array initializer + PsiElement([)('[') + Literal + PsiElement(Integer)('8') + PsiElement(])(']') Throw clause <empty list> PsiElement(;)(';') diff --git a/plugins/groovy/testdata/parsing/groovy/types/default1.test b/plugins/groovy/testdata/parsing/groovy/types/default1.test index 94cc6ece5f07..46d59f6653be 100644 --- a/plugins/groovy/testdata/parsing/groovy/types/default1.test +++ b/plugins/groovy/testdata/parsing/groovy/types/default1.test @@ -34,15 +34,14 @@ Groovy script <empty list> PsiElement())(')') PsiWhiteSpace(' ') - Default annotation value - PsiElement(default)('default') - PsiWhiteSpace(' ') - Annotation - PsiElement(@)('@') - Reference element - PsiElement(identifier)('Bar') - Annotation arguments - <empty list> + PsiElement(default)('default') + PsiWhiteSpace(' ') + Annotation + PsiElement(@)('@') + Reference element + PsiElement(identifier)('Bar') + Annotation arguments + <empty list> Throw clause <empty list> PsiWhiteSpace(' ') diff --git a/plugins/groovy/testdata/parsing/groovy/types/default2.test b/plugins/groovy/testdata/parsing/groovy/types/default2.test index 05a31b6762d9..026bb8c470df 100644 --- a/plugins/groovy/testdata/parsing/groovy/types/default2.test +++ b/plugins/groovy/testdata/parsing/groovy/types/default2.test @@ -34,11 +34,10 @@ Groovy script <empty list> PsiElement())(')') PsiWhiteSpace(' ') - Default annotation value - PsiElement(default)('default') - PsiWhiteSpace(' ') - Literal - PsiElement(Integer)('5') + PsiElement(default)('default') + PsiWhiteSpace(' ') + Literal + PsiElement(Integer)('5') Throw clause <empty list> PsiElement(new line)('\n') diff --git a/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties b/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties index 5f5a1679709f..af459be969f5 100644 --- a/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties +++ b/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties @@ -48,7 +48,7 @@ hg4idea.clone.test.success=Connection Successful hg4idea.configuration.title=Mercurial Configuration hg4idea.configuration.executable.title=Mercurial executable hg4idea.configuration.description=Specify the full path to hg executable -hg4idea.configuration.executable.error=\"{0}\" doesn''t appear to be a valid hg executable +hg4idea.configuration.executable.error=\"{0}\" doesn't appear to be a valid hg executable hg4idea.configuration.test.label=Test hg4idea.configuration.test=&Test hg4idea.unable.to.run.hg=Unable to run hg: {0} @@ -80,7 +80,7 @@ hg4idea.init.already.under.hg.option.create.repo.here=Create new repository here hg4idea.init.created.notification.title=Mercurial repository created hg4idea.init.created.notification.description=Repository was created in {0} hg4idea.init.error.title=Error creating Mercurial repository -hg4idea.init.error.description=Couldn''t create a Mercurial repository in {0} +hg4idea.init.error.description=Couldn't create a Mercurial repository in {0} hg4idea.move.progress=Moving files in the VCS... diff --git a/plugins/hg4idea/src/META-INF/plugin.xml b/plugins/hg4idea/src/META-INF/plugin.xml index f0ce13c23b43..d47b955104be 100644 --- a/plugins/hg4idea/src/META-INF/plugin.xml +++ b/plugins/hg4idea/src/META-INF/plugin.xml @@ -77,6 +77,9 @@ <action id="hg4idea.tag" class="org.zmlx.hg4idea.action.HgCreateTagAction"/> <action id="hg4idea.updateTo" class="org.zmlx.hg4idea.action.HgUpdateToAction"/> <action id="hg4idea.resolve.mark" class="org.zmlx.hg4idea.action.HgMarkResolved"/> + <separator/> + <action id="hg4idea.Rebase.Abort" class="org.zmlx.hg4idea.action.HgAbortRebaseAction" text="Abort Rebasing"/> + <action id="hg4idea.Rebase.Continue" class="org.zmlx.hg4idea.action.HgContinueRebaseAction" text="Continue Rebasing"/> <separator/> <reference id="ChangesView.Browse"/> diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgPusher.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgPusher.java index 17d4f364a154..2e9321253b7e 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgPusher.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgPusher.java @@ -21,6 +21,7 @@ import com.intellij.openapi.progress.Task; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.MessageType; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; @@ -90,12 +91,10 @@ public class HgPusher { String successTitle = "Pushed successfully"; String successDescription = String.format("Pushed %d %s [%s]", commitsNum, StringUtil.pluralize("commit", commitsNum), repo.getPresentableName()); - new HgCommandResultNotifier(project).notifySuccess(successTitle, successDescription); - } - else if (result.getExitValue() == NOTHING_TO_PUSH_EXIT_VALUE) { - new HgCommandResultNotifier(project).notifySuccess("", "Nothing to push"); - } - else { + VcsNotifier.getInstance(project).notifySuccess(successTitle, successDescription); + } else if (result.getExitValue() == NOTHING_TO_PUSH_EXIT_VALUE) { + VcsNotifier.getInstance(project).notifySuccess("Nothing to push"); + } else { new HgCommandResultNotifier(project).notifyError(result, "Push failed", "Failed to push to [" + repo.getPresentableName() + "]"); } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java index 0c6ac2aa227d..8745a6b738b5 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java @@ -18,6 +18,7 @@ import com.intellij.notification.NotificationListener; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.application.ModalityState; +import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.diff.impl.patch.formove.FilePathComparator; import com.intellij.openapi.editor.markup.TextAttributes; @@ -38,6 +39,7 @@ import com.intellij.openapi.vcs.diff.DiffProvider; import com.intellij.openapi.vcs.history.VcsHistoryProvider; import com.intellij.openapi.vcs.merge.MergeProvider; import com.intellij.openapi.vcs.rollback.RollbackEnvironment; +import com.intellij.openapi.vcs.roots.VcsRootDetector; import com.intellij.openapi.vcs.update.UpdateEnvironment; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.openapi.vfs.VfsUtilCore; @@ -48,12 +50,12 @@ import com.intellij.util.messages.MessageBusConnection; import com.intellij.util.messages.Topic; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.zmlx.hg4idea.action.HgCommandResultNotifier; import org.zmlx.hg4idea.provider.*; import org.zmlx.hg4idea.provider.annotate.HgAnnotationProvider; import org.zmlx.hg4idea.provider.commit.HgCheckinEnvironment; import org.zmlx.hg4idea.provider.commit.HgCommitAndPushExecutor; import org.zmlx.hg4idea.provider.update.HgUpdateEnvironment; +import org.zmlx.hg4idea.roots.HgIntegrationEnabler; import org.zmlx.hg4idea.status.HgRemoteStatusUpdater; import org.zmlx.hg4idea.status.ui.HgHideableWidget; import org.zmlx.hg4idea.status.ui.HgIncomingOutgoingWidget; @@ -63,6 +65,7 @@ import org.zmlx.hg4idea.util.HgVersion; import javax.swing.event.HyperlinkEvent; import java.io.File; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -402,6 +405,17 @@ public class HgVcs extends AbstractVcs<CommittedChangeList> { } @Override + @CalledInAwt + public void enableIntegration() { + ApplicationManager.getApplication().executeOnPooledThread(new Runnable() { + public void run() { + Collection<VcsRoot> roots = ServiceManager.getService(myProject, VcsRootDetector.class).detect(); + new HgIntegrationEnabler(HgVcs.this).enable(roots); + } + }); + } + + @Override public CheckoutProvider getCheckoutProvider() { return new HgCheckoutProvider(); } @@ -412,7 +426,7 @@ public class HgVcs extends AbstractVcs<CommittedChangeList> { */ public void checkVersion() { final String executable = getGlobalSettings().getHgExecutable(); - HgCommandResultNotifier errorNotification = new HgCommandResultNotifier(myProject); + VcsNotifier vcsNotifier = VcsNotifier.getInstance(myProject); final String SETTINGS_LINK = "settings"; final String UPDATE_LINK = "update"; NotificationListener linkAdapter = new NotificationListener.Adapter() { @@ -436,14 +450,14 @@ public class HgVcs extends AbstractVcs<CommittedChangeList> { String message = String.format("The <a href='" + SETTINGS_LINK + "'>configured</a> version of Hg is not supported: %s.<br/> " + "The minimal supported version is %s. Please <a href='" + UPDATE_LINK + "'>update</a>.", myVersion, HgVersion.MIN); - errorNotification.notifyError(null, "Unsupported Hg version", message, linkAdapter); + vcsNotifier.notifyError("Unsupported Hg version", message, linkAdapter); } else if (myVersion.hasUnsupportedExtensions()) { String unsupportedExtensionsAsString = myVersion.getUnsupportedExtensions().toString(); LOG.warn("Unsupported Hg extensions: " + unsupportedExtensionsAsString); String message = String.format("Some hg extensions %s are not found or not supported by your hg version and will be ignored.\n" + "Please, update your hgrc or Mercurial.ini file", unsupportedExtensionsAsString); - errorNotification.notifyWarning("Unsupported Hg version", message); + vcsNotifier.notifyWarning("Unsupported Hg version", message); } } catch (Exception e) { @@ -452,13 +466,15 @@ public class HgVcs extends AbstractVcs<CommittedChangeList> { // so parse(output) throw ParseException, but hg and git executable seems to be valid in this case final String reason = (e.getCause() != null ? e.getCause() : e).getMessage(); String message = HgVcsMessages.message("hg4idea.unable.to.run.hg", executable); - errorNotification.notifyError(null, message, - String.format( - reason + - "<br/> Please check your hg executable path in <a href='" + - SETTINGS_LINK + - "'> settings </a>"), - linkAdapter); + vcsNotifier.notifyError(message, + String.format( + reason + + "<br/> Please check your hg executable path in <a href='" + + SETTINGS_LINK + + "'> settings </a>" + ), + linkAdapter + ); } } } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbortRebaseAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbortRebaseAction.java new file mode 100644 index 000000000000..2be1ddd95f7d --- /dev/null +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbortRebaseAction.java @@ -0,0 +1,51 @@ +/* + * Copyright 2000-2014 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 org.zmlx.hg4idea.action; + +import com.intellij.openapi.progress.ProgressIndicator; +import com.intellij.openapi.progress.Task; +import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.zmlx.hg4idea.command.HgRebaseCommand; +import org.zmlx.hg4idea.execution.HgCommandResult; +import org.zmlx.hg4idea.repo.HgRepository; +import org.zmlx.hg4idea.util.HgErrorUtil; + +import java.util.Collection; + +public class HgAbortRebaseAction extends HgProcessRebaseAction { + + @Override + protected void execute(@NotNull final Project project, + @NotNull Collection<HgRepository> repositories, + @Nullable final HgRepository selectedRepo) { + + new Task.Backgroundable(project, "Abort Rebasing...") { + @Override + public void run(@NotNull ProgressIndicator indicator) { + if (selectedRepo != null) { + HgRebaseCommand rebaseCommand = new HgRebaseCommand(project, selectedRepo); + HgCommandResult result = rebaseCommand.abortRebase(); + if (HgErrorUtil.isAbort(result)) { + new HgCommandResultNotifier(project).notifyError(result, "Hg Error", "Couldn't abort rebasing"); + } + markDirtyAndHandleErrors(project, selectedRepo.getRoot()); + } + } + }.queue(); + } +} diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractGlobalAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractGlobalAction.java index 9984facc8037..d38bc7bfc6a7 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractGlobalAction.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractGlobalAction.java @@ -89,7 +89,7 @@ abstract class HgAbstractGlobalAction extends AnAction { } } - public static boolean isEnabled(AnActionEvent e) { + public boolean isEnabled(AnActionEvent e) { Project project = e.getData(CommonDataKeys.PROJECT); if (project == null) { return false; @@ -101,4 +101,17 @@ abstract class HgAbstractGlobalAction extends AnAction { } return true; } + + @Nullable + public static HgRepository getSelectedRepositoryFromEvent(AnActionEvent e) { + final DataContext dataContext = e.getDataContext(); + final Project project = CommonDataKeys.PROJECT.getData(dataContext); + if (project == null) { + return null; + } + VirtualFile file = e.getData(CommonDataKeys.VIRTUAL_FILE); + HgRepositoryManager repositoryManager = HgUtil.getRepositoryManager(project); + return file != null ? repositoryManager.getRepositoryForFile(file) : HgUtil.getCurrentRepository(project); + } + } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopupActions.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopupActions.java index 01627240d8e4..62d5981e55f7 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopupActions.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopupActions.java @@ -221,7 +221,7 @@ public class HgBranchPopupActions { e.getPresentation().setEnabled(false); e.getPresentation().setDescription("Checkout of a new branch is not possible before the first commit."); } - else if (Repository.State.MERGING.equals(myRepository.getState())) { + else if (!Repository.State.NORMAL.equals(myRepository.getState())) { e.getPresentation().setEnabled(false); } } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgCommandResultNotifier.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgCommandResultNotifier.java index 73d5506396c7..45cfd6cfb6d1 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgCommandResultNotifier.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgCommandResultNotifier.java @@ -12,14 +12,11 @@ // limitations under the License. package org.zmlx.hg4idea.action; -import com.intellij.notification.NotificationDisplayType; -import com.intellij.notification.NotificationGroup; import com.intellij.notification.NotificationListener; -import com.intellij.notification.NotificationType; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.openapi.vcs.changes.ui.ChangesViewContentManager; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.xml.util.XmlStringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,23 +28,11 @@ public final class HgCommandResultNotifier { private final Project myProject; private static final Logger LOG = Logger.getInstance(HgCommandResultNotifier.class); - public static final NotificationGroup NOTIFICATION_GROUP = NotificationGroup.toolWindowGroup( - "Mercurial Messages", ChangesViewContentManager.TOOLWINDOW_ID, true); - public static final NotificationGroup IMPORTANT_ERROR_NOTIFICATION = new NotificationGroup( - "Mercurial Important Messages", NotificationDisplayType.STICKY_BALLOON, true); public HgCommandResultNotifier(Project project) { myProject = project; } - public void notifySuccess(@NotNull String title, @NotNull String successDescription) { - NOTIFICATION_GROUP.createNotification(title, successDescription, NotificationType.INFORMATION, null).notify(myProject); - } - - public void notifyWarning(@NotNull String title, @NotNull String warningDescription) { - NOTIFICATION_GROUP.createNotification(title, warningDescription, NotificationType.WARNING, null).notify(myProject); - } - public void notifyError(@Nullable HgCommandResult result, @NotNull String failureTitle, @NotNull String failureDescription) { notifyError(result, failureTitle, failureDescription, null); } @@ -75,8 +60,6 @@ public final class HgCommandResultNotifier { errorMessage = XmlStringUtil.wrapInHtml(failureDescription + "<br>" + StringUtil.join(err, "<br>")); } } - IMPORTANT_ERROR_NOTIFICATION - .createNotification(failureTitle, errorMessage, NotificationType.ERROR, listener) - .notify(myProject); + VcsNotifier.getInstance(myProject).notifyError(failureTitle, errorMessage, listener); } } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgCommonBranchActions.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgCommonBranchActions.java index 992a26c6ab5e..a8972f86939a 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgCommonBranchActions.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgCommonBranchActions.java @@ -22,6 +22,7 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.Task; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.update.UpdatedFiles; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; @@ -73,7 +74,6 @@ public class HgCommonBranchActions extends ActionGroup { final HgMergeCommand hgMergeCommand = new HgMergeCommand(myProject, mySelectedRepository.getRoot()); hgMergeCommand.setRevision(myBranchName);//there is no difference between branch or revision or bookmark as parameter to merge, // we need just a string - final HgCommandResultNotifier notifier = new HgCommandResultNotifier(myProject); new Task.Backgroundable(myProject, "Merging changes...") { @Override public void run(@NotNull ProgressIndicator indicator) { @@ -84,11 +84,12 @@ public class HgCommonBranchActions extends ActionGroup { } catch (VcsException exception) { + assert myProject != null; // myProject couldn't be null, see annotation for Merge action if (exception.isWarning()) { - notifier.notifyWarning("Warning during merge", exception.getMessage()); + VcsNotifier.getInstance(myProject).notifyWarning("Warning during merge", exception.getMessage()); } else { - notifier.notifyError(null, "Exception during merge", exception.getMessage()); + VcsNotifier.getInstance(myProject).notifyError("Exception during merge", exception.getMessage()); } } catch (Exception e1) { diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgContinueRebaseAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgContinueRebaseAction.java new file mode 100644 index 000000000000..bfc01cbbad20 --- /dev/null +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgContinueRebaseAction.java @@ -0,0 +1,51 @@ +/* + * Copyright 2000-2014 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 org.zmlx.hg4idea.action; + +import com.intellij.openapi.progress.ProgressIndicator; +import com.intellij.openapi.progress.Task; +import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.zmlx.hg4idea.command.HgRebaseCommand; +import org.zmlx.hg4idea.execution.HgCommandResult; +import org.zmlx.hg4idea.repo.HgRepository; +import org.zmlx.hg4idea.util.HgErrorUtil; + +import java.util.Collection; + +public class HgContinueRebaseAction extends HgProcessRebaseAction { + + @Override + protected void execute(@NotNull final Project project, + @NotNull Collection<HgRepository> repositories, + @Nullable final HgRepository selectedRepo) { + + new Task.Backgroundable(project, "Continue Rebasing...") { + @Override + public void run(@NotNull ProgressIndicator indicator) { + if (selectedRepo != null) { + HgRebaseCommand rebaseCommand = new HgRebaseCommand(project, selectedRepo); + HgCommandResult result = rebaseCommand.continueRebase(); + if (HgErrorUtil.isAbort(result)) { + new HgCommandResultNotifier(project).notifyError(result, "Hg Error", "Couldn't continue rebasing"); + } + markDirtyAndHandleErrors(project, selectedRepo.getRoot()); + } + } + }.queue(); + } +} diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgInit.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgInit.java index 27346660015b..7d329a3f3652 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgInit.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgInit.java @@ -2,12 +2,12 @@ package org.zmlx.hg4idea.action; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsDirectoryMapping; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.Nullable; @@ -116,15 +116,17 @@ public class HgInit extends DumbAwareAction { public void process(@Nullable HgCommandResult result) { if (!HgErrorUtil.hasErrorsInCommandExecution(result)) { updateDirectoryMappings(mapRoot); - new HgCommandResultNotifier(myProject.isDefault() ? null : myProject) - .notifySuccess(HgVcsMessages.message("hg4idea.init.created.notification.title"), - HgVcsMessages.message("hg4idea.init.created.notification.description", selectedRoot.getPresentableUrl())); + VcsNotifier.getInstance(myProject).notifySuccess(HgVcsMessages.message("hg4idea.init.created.notification.title"), + HgVcsMessages.message("hg4idea.init.created.notification.description", + selectedRoot.getPresentableUrl()) + ); } else { new HgCommandResultNotifier(myProject.isDefault() ? null : myProject) .notifyError(result, HgVcsMessages.message("hg4idea.init.error.title"), HgVcsMessages.message("hg4idea.init.error.description", selectedRoot - .getPresentableUrl())); + .getPresentableUrl() + )); } } }); diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMerge.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMerge.java index 87c907d76d59..1743e7e5b56e 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMerge.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMerge.java @@ -19,6 +19,7 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.Task; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.openapi.vcs.update.UpdatedFiles; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; @@ -62,7 +63,6 @@ public class HgMerge extends HgAbstractGlobalAction { private static void executeMerge(@NotNull final Project project, @NotNull VirtualFile repo, @NotNull String targetValue) throws HgCommandException { UpdatedFiles updatedFiles = UpdatedFiles.create(); - HgCommandResultNotifier notifier = new HgCommandResultNotifier(project); HgMergeCommand hgMergeCommand = new HgMergeCommand(project, repo); hgMergeCommand.setRevision(targetValue); @@ -73,10 +73,10 @@ public class HgMerge extends HgAbstractGlobalAction { } catch (VcsException e) { if (e.isWarning()) { - notifier.notifyWarning("Warning during merge", e.getMessage()); + VcsNotifier.getInstance(project).notifyWarning("Warning during merge", e.getMessage()); } else { - notifier.notifyError(null, "Exception during merge", e.getMessage()); + VcsNotifier.getInstance(project).notifyError("Exception during merge", e.getMessage()); } } } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgProcessRebaseAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgProcessRebaseAction.java new file mode 100644 index 000000000000..342369f0a9bb --- /dev/null +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgProcessRebaseAction.java @@ -0,0 +1,32 @@ +/* + * Copyright 2000-2014 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 org.zmlx.hg4idea.action; + +import com.intellij.openapi.actionSystem.AnActionEvent; +import org.zmlx.hg4idea.repo.HgRepository; + +public abstract class HgProcessRebaseAction extends HgAbstractGlobalAction { + + protected static boolean isRebasing(AnActionEvent e) { + HgRepository repository = HgAbstractGlobalAction.getSelectedRepositoryFromEvent(e); + return repository != null && repository.getState() == HgRepository.State.REBASING; + } + + @Override + public boolean isEnabled(AnActionEvent e) { + return super.isEnabled(e) && isRebasing(e); + } +} diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgPullAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgPullAction.java index 557d3cfab286..0d1f79b7f488 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgPullAction.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgPullAction.java @@ -51,8 +51,6 @@ public class HgPullAction extends HgAbstractGlobalAction { project, dialog.getRepository() ); command.setSource(dialog.getSource()); - command.setRebase(false); - command.setUpdate(false); command.execute(); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnLoadedBranches.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommandExitCode.java index 0dc10aed38e0..b0981959b21a 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnLoadedBranches.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommandExitCode.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.idea.svn; +package org.zmlx.hg4idea.command; /** - * Created by IntelliJ IDEA. - * User: Irina.Chernushina - * Date: 8/24/11 - * Time: 1:07 PM - * To change this template use File | Settings | File Templates. + * Enum for several types of hg command returned values; + * see for example {@link HgPullCommand} */ -public class SvnLoadedBranches { + +public enum HgCommandExitCode { + SUCCESS, // 0 returned value + UNRESOLVED, // 1 returned value usually means that command executed with some not critical errors or conflicts + ERROR // other exit value } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPullCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPullCommand.java index 3be5904b379e..8f8408a370d7 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPullCommand.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPullCommand.java @@ -12,7 +12,6 @@ // limitations under the License. package org.zmlx.hg4idea.command; -import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -26,6 +25,8 @@ import org.zmlx.hg4idea.util.HgErrorUtil; import java.util.LinkedList; import java.util.List; +import static org.zmlx.hg4idea.command.HgCommandExitCode.*; + public class HgPullCommand { private final Project project; @@ -33,9 +34,8 @@ public class HgPullCommand { private String source; private String revision; - private boolean update = true; - private boolean rebase = !update; - private static final Logger LOG = Logger.getInstance(HgPullCommand.class); + private boolean update; + private boolean rebase; public HgPullCommand(Project project, @NotNull VirtualFile repo) { this.project = project; @@ -58,7 +58,7 @@ public class HgPullCommand { this.source = source; } - public boolean execute() { + public HgCommandExitCode execute() { List<String> arguments = new LinkedList<String>(); if (update) { arguments.add("--update"); @@ -79,13 +79,19 @@ public class HgPullCommand { if (HgErrorUtil.isAuthorizationError(result)) { new HgCommandResultNotifier(project) .notifyError(result, "Authorization required", "http authorization required for <code>" + source + "</code>"); - return false; - } else if (HgErrorUtil.hasErrorsInCommandExecution(result)) { + return ERROR; + } + else if (HgErrorUtil.isAbort(result) || result.getExitValue() > 1) { //if result == null - > isAbort returns true new HgCommandResultNotifier(project).notifyError(result, "", "Pull failed"); - return false; - } else { + return ERROR; + } + else if (result.getExitValue() == 1) { + return UNRESOLVED; + } + else { project.getMessageBus().syncPublisher(HgVcs.REMOTE_TOPIC).update(project, null); - return true; + return SUCCESS; } } + } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRebaseCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRebaseCommand.java index 9f9fd265047f..6eeafffd5979 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRebaseCommand.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRebaseCommand.java @@ -13,26 +13,35 @@ package org.zmlx.hg4idea.command; import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.zmlx.hg4idea.HgVcs; import org.zmlx.hg4idea.execution.HgCommandExecutor; +import org.zmlx.hg4idea.execution.HgCommandResult; +import org.zmlx.hg4idea.repo.HgRepository; import java.util.Arrays; public class HgRebaseCommand { - private final Project project; - private final VirtualFile repo; + @NotNull private final Project project; + @NotNull private final HgRepository repo; - public HgRebaseCommand(Project project, @NotNull VirtualFile repo) { + public HgRebaseCommand(@NotNull Project project, @NotNull HgRepository repo) { this.project = project; this.repo = repo; } - public void continueRebase() { - new HgCommandExecutor(project).execute(repo, "rebase", Arrays.asList("--continue"), null); + public HgCommandResult continueRebase() { + HgCommandResult result = new HgCommandExecutor(project).executeInCurrentThread(repo.getRoot(), "rebase", Arrays.asList("--continue"), null); + repo.update(); project.getMessageBus().syncPublisher(HgVcs.BRANCH_TOPIC).update(project, null); + return result; } + public HgCommandResult abortRebase() { + HgCommandResult result = new HgCommandExecutor(project).executeInCurrentThread(repo.getRoot(), "rebase", Arrays.asList("--abort"), null); + repo.update(); + project.getMessageBus().syncPublisher(HgVcs.BRANCH_TOPIC).update(project, null); + return result; + } } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java b/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java index 9c90f5fc11f5..be9f64b30780 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java @@ -68,7 +68,7 @@ public class HgLogProvider implements VcsLogProvider { @NotNull @Override public List<TimedVcsCommit> readAllHashes(@NotNull VirtualFile root, @NotNull Consumer<VcsUser> userRegistry) throws VcsException { - return HgHistoryUtil.readAllHashes(myProject, root, userRegistry); + return HgHistoryUtil.readAllHashes(myProject, root, userRegistry, Collections.<String>emptyList()); } @NotNull @@ -155,9 +155,9 @@ public class HgLogProvider implements VcsLogProvider { @NotNull @Override - public List<? extends VcsFullCommitDetails> getFilteredDetails(@NotNull final VirtualFile root, - @NotNull VcsLogFilterCollection filterCollection, - int maxCount) throws VcsException { + public List<TimedVcsCommit> getCommitsMatchingFilter(@NotNull final VirtualFile root, + @NotNull VcsLogFilterCollection filterCollection, + int maxCount) throws VcsException { List<String> filterParameters = ContainerUtil.newArrayList(); // branch filter and user filter may be used several times without delimiter @@ -170,7 +170,7 @@ public class HgLogProvider implements VcsLogProvider { boolean atLeastOneBranchExists = false; for (String branchName : filterCollection.getBranchFilter().getBranchNames()) { - if (branchExists(repository, branchName)) { + if (branchName.equals("tip") || branchExists(repository, branchName)) { filterParameters.add(prepareParameter("branch", branchName)); atLeastOneBranchExists = true; } @@ -216,7 +216,7 @@ public class HgLogProvider implements VcsLogProvider { } } - return HgHistoryUtil.history(myProject, root, maxCount, filterParameters); + return HgHistoryUtil.readAllHashes(myProject, root, Consumer.EMPTY_CONSUMER, filterParameters); } @Nullable @@ -246,6 +246,11 @@ public class HgLogProvider implements VcsLogProvider { return HgHistoryUtil.getDescendingHeadsOfBranches(myProject, root, commitHash); } + @Override + public boolean supportsFastUnorderedCommits() { + return false; + } + private static String prepareParameter(String paramName, String value) { return "--" + paramName + "=" + value; // no value escaping needed, because the parameter itself will be quoted by GeneralCommandLine } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java index 87e346646c3e..f0bc186d9e2d 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java @@ -40,7 +40,7 @@ public final class HgConflictResolver { this(project, null); } - public HgConflictResolver(Project project, UpdatedFiles updatedFiles) { + public HgConflictResolver(@NotNull Project project, UpdatedFiles updatedFiles) { this.myProject = project; this.updatedFiles = updatedFiles; } @@ -65,7 +65,7 @@ public final class HgConflictResolver { updatedFiles.getGroupById(FileGroup.UPDATED_ID).remove(file.getAbsolutePath()); //TODO get the correct revision to pass to the UpdatedFiles updatedFiles.getGroupById(fileGroupId) - .add(file.getPath(), HgVcs.VCS_NAME, null); + .add(file.getPath(), HgVcs.VCS_NAME, null); } } @@ -74,7 +74,9 @@ public final class HgConflictResolver { } final HgVcs vcs = HgVcs.getInstance(myProject); - if (vcs == null) { return; } + if (vcs == null) { + return; + } ApplicationManager.getApplication().invokeAndWait(new Runnable() { public void run() { AbstractVcsHelper.getInstance(myProject).showMergeDialog(conflicts, vcs.getMergeProvider()); @@ -82,4 +84,19 @@ public final class HgConflictResolver { }, ModalityState.defaultModalityState()); } + public static List<VirtualFile> findConflicts(final Project project, VirtualFile repo) { + Map<HgFile, HgResolveStatusEnum> resolves = new HgResolveCommand(project).getListSynchronously(repo); + final List<VirtualFile> conflicts = new ArrayList<VirtualFile>(); + for (Map.Entry<HgFile, HgResolveStatusEnum> entry : resolves.entrySet()) { + File file = entry.getKey().getFile(); + switch (entry.getValue()) { + case UNRESOLVED: + conflicts.add(VcsUtil.getVirtualFile(file)); + break; + default: + break; + } + } + return conflicts; + } } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java index 355405f33e7f..98f6cad13ba3 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java @@ -23,9 +23,12 @@ import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.zmlx.hg4idea.*; +import org.zmlx.hg4idea.action.HgCommandResultNotifier; import org.zmlx.hg4idea.command.*; import org.zmlx.hg4idea.execution.HgCommandException; import org.zmlx.hg4idea.execution.HgCommandResult; +import org.zmlx.hg4idea.repo.HgRepository; +import org.zmlx.hg4idea.util.HgErrorUtil; import org.zmlx.hg4idea.util.HgUtil; import java.util.ArrayList; @@ -47,12 +50,8 @@ public class HgRegularUpdater implements HgUpdater { this.updateConfiguration = configuration; } - private boolean shouldPull() { - return updateConfiguration.shouldPull(); - } - - private boolean shouldUpdate() { - return updateConfiguration.shouldUpdate(); + private boolean shouldRebase() { + return updateConfiguration.shouldRebase(); } private boolean shouldMerge() { @@ -88,27 +87,28 @@ public class HgRegularUpdater implements HgUpdater { // throw new VcsException("working dir not at branch tip (use \"Update to...\" to check out branch tip)"); // } - if (shouldPull()) { - boolean pullResult = pull(repoRoot, indicator); - if (!pullResult) { - return false; - } + HgRevisionNumber parentBeforeUpdate = new HgWorkingCopyRevisionsCommand(project).firstParent(repoRoot); + HgCommandExitCode pullResult = pull(repoRoot, indicator, shouldRebase()); + if (pullResult == HgCommandExitCode.ERROR) { + return false; } - if (shouldUpdate()) { + if (pullResult == HgCommandExitCode.SUCCESS) { + HgRevisionNumber parentAfterUpdate = new HgWorkingCopyRevisionsCommand(project).firstParent(repoRoot); + addUpdatedFiles(repoRoot, updatedFiles, parentBeforeUpdate, parentAfterUpdate); + return true; + } - List<HgRevisionNumber> parentsBeforeUpdate = new HgWorkingCopyRevisionsCommand(project).parents(repoRoot); - if (parentsBeforeUpdate.size() > 1) { - throw new VcsException(HgVcsMessages.message("hg4idea.update.error.uncommittedMerge", repoRoot.getPath())); - } + if (shouldMerge()) { indicator.setText2(HgVcsMessages.message("hg4idea.progress.countingHeads")); List<HgRevisionNumber> branchHeadsAfterPull = new HgHeadsCommand(project, repoRoot).execute(); List<HgRevisionNumber> pulledBranchHeads = determinePulledBranchHeads(branchHeadsBeforePull, branchHeadsAfterPull); - List<HgRevisionNumber> remainingOriginalBranchHeads = determingRemainingOriginalBranchHeads(branchHeadsBeforePull, branchHeadsAfterPull); + List<HgRevisionNumber> remainingOriginalBranchHeads = + determingRemainingOriginalBranchHeads(branchHeadsBeforePull, branchHeadsAfterPull); - if (branchHeadsAfterPull.size() > 1 && shouldMerge()) { + if (branchHeadsAfterPull.size() > 1) { abortOnLocalChanges(); abortOnMultiplePulledHeads(pulledBranchHeads); abortOnMultipleLocalHeads(remainingOriginalBranchHeads); @@ -118,14 +118,14 @@ public class HgRegularUpdater implements HgUpdater { if (shouldCommitAfterMerge()) { commitOrWarnAboutConflicts(warnings, mergeResult); } - } else { - //in case of multiple heads the update will report the appropriate error - update(repoRoot, indicator, updatedFiles, warnings); } - //any kind of update could have resulted in merges and merge conflicts, so run the resolver resolvePossibleConflicts(updatedFiles); } + else { + processRebase(updatedFiles); + } + return true; } @@ -207,6 +207,24 @@ public class HgRegularUpdater implements HgUpdater { return new HgHeadMerger(project, mergeCommand).merge(repoRoot); } + private void processRebase(final UpdatedFiles updatedFiles) throws VcsException { + HgRepository repository = HgUtil.getRepositoryManager(project).getRepositoryForRoot(repoRoot); + HgCommandResult result; + do { + resolvePossibleConflicts(updatedFiles); + if (repository == null || !HgConflictResolver.findConflicts(project, repoRoot).isEmpty()) { + return; + } + HgRebaseCommand rebaseCommand = new HgRebaseCommand(project, repository); + result = rebaseCommand.continueRebase(); + if (HgErrorUtil.isAbort(result)) { + new HgCommandResultNotifier(project).notifyError(result, "Hg Error", "Couldn't continue rebasing"); + return; + } + } + while (result.getExitValue() == 1); + } + private void abortOnLocalChanges() throws VcsException { if (getLocalChanges().size() != 0) { throw new VcsException(HgVcsMessages.message("hg4idea.update.error.localchanges", repoRoot.getPath())); @@ -222,14 +240,18 @@ public class HgRegularUpdater implements HgUpdater { return statusCommand.execute(repoRoot); } - private boolean pull(VirtualFile repo, ProgressIndicator indicator) + private HgCommandExitCode pull(VirtualFile repo, ProgressIndicator indicator, boolean isRebase) throws VcsException { indicator.setText2(HgVcsMessages.message("hg4idea.progress.pull.with.update")); HgPullCommand hgPullCommand = new HgPullCommand(project, repo); final String defaultPath = HgUtil.getRepositoryDefaultPath(project, repo); hgPullCommand.setSource(defaultPath); - hgPullCommand.setUpdate(false); - hgPullCommand.setRebase(false); + if (isRebase) { + hgPullCommand.setRebase(true); + } + else { + hgPullCommand.setUpdate(true); + } return hgPullCommand.execute(); } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdater.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdater.java index a724f4501acb..c0897f153834 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdater.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdater.java @@ -23,19 +23,11 @@ public interface HgUpdater { boolean update(UpdatedFiles updatedFiles, ProgressIndicator indicator, List<VcsException> exceptions) throws VcsException; - static class UpdateConfiguration{ - private boolean shouldPull = true; - private boolean shouldUpdate = true; + class UpdateConfiguration{ private boolean shouldMerge = true; private boolean shouldCommitAfterMerge = true; + private boolean shouldRebase = true; - public void setShouldPull(boolean shouldPull) { - this.shouldPull = shouldPull; - } - - public void setShouldUpdate(boolean shouldUpdate) { - this.shouldUpdate = shouldUpdate; - } public void setShouldMerge(boolean shouldMerge) { this.shouldMerge = shouldMerge; @@ -45,16 +37,16 @@ public interface HgUpdater { this.shouldCommitAfterMerge = shouldCommitAfterMerge; } - public boolean shouldPull() { - return shouldPull; - } - - public boolean shouldUpdate() { - return shouldUpdate; + public void setShouldRebase(boolean shouldRebase) { + this.shouldRebase = shouldRebase; + } + + public boolean shouldRebase() { + return shouldRebase; } public boolean shouldMerge() { - return shouldUpdate() && shouldMerge; + return shouldMerge; } public boolean shouldCommitAfterMerge() { diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryFiles.java b/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryFiles.java index d6ee73922a71..7c97f07fbfbe 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryFiles.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryFiles.java @@ -34,6 +34,7 @@ public class HgRepositoryFiles { // so check for starting branch public static final String BRANCHEADSDIR = "cache"; public static final String MERGE = "merge"; + public static final String REBASE = "rebase"; //rebasestate public static final String BRANCH = "branch"; public static final String BOOKMARKS = "bookmarks"; public static final String LOCAL_TAGS = "localtags"; @@ -45,6 +46,7 @@ public class HgRepositoryFiles { @NotNull private final String myBranchHeadsPath; @NotNull private final String myBranchHeadsDirPath; @NotNull private final String myMergePath; + @NotNull private final String myRebasePath; @NotNull private final String myBranchPath; @NotNull private final String myBookmarksPath; @NotNull private final String myTagsPath; @@ -62,6 +64,7 @@ public class HgRepositoryFiles { myBranchHeadsDirPath = hgDir.getPath() + slash(BRANCHEADSDIR); myBranchPath = hgDir.getPath() + slash(BRANCH); myMergePath = hgDir.getPath() + slash(MERGE); + myRebasePath = hgDir.getPath() + slash(REBASE); myBookmarksPath = hgDir.getPath() + slash(BOOKMARKS); myTagsPath = hgDir.getParent().getPath() + slash(TAGS); myLocalTagsPath = hgDir.getPath() + slash(LOCAL_TAGS); @@ -99,6 +102,10 @@ public class HgRepositoryFiles { return filePath.startsWith(myMergePath); } + public boolean isRebaseFile(String filePath) { + return filePath.startsWith(myRebasePath); + } + public boolean isBookmarksFile(String filePath) { return filePath.equals(myBookmarksPath); } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryReader.java b/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryReader.java index e35d7892d331..bfec1db1573b 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryReader.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryReader.java @@ -142,8 +142,15 @@ public class HgRepositoryReader { return new File(myHgDir, "merge").exists(); } + public boolean isRebaseInProgress() { + return new File(myHgDir, "rebasestate").exists(); + } + @NotNull public Repository.State readState() { + if (isRebaseInProgress()) { + return Repository.State.REBASING; + } return isMergeInProgress() ? Repository.State.MERGING : Repository.State.NORMAL; } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryUpdater.java b/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryUpdater.java index 1b53bdcd5e58..39a3106b8761 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryUpdater.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryUpdater.java @@ -91,6 +91,7 @@ final class HgRepositoryUpdater implements Disposable, BulkFileListener { boolean branchHeadsChanged = false; boolean branchFileChanged = false; boolean mergeFileChanged = false; + boolean rebaseFileChanged = false; boolean bookmarksFileChanged = false; boolean tagsFileChanged = false; boolean localTagsFileChanged = false; @@ -111,6 +112,9 @@ final class HgRepositoryUpdater implements Disposable, BulkFileListener { else if (myRepositoryFiles.isMergeFile(filePath)) { mergeFileChanged = true; } + else if (myRepositoryFiles.isRebaseFile(filePath)) { + rebaseFileChanged = true; + } else if (myRepositoryFiles.isBookmarksFile(filePath)) { bookmarksFileChanged = true; } @@ -132,6 +136,7 @@ final class HgRepositoryUpdater implements Disposable, BulkFileListener { if (branchHeadsChanged || branchFileChanged || mergeFileChanged || + rebaseFileChanged || bookmarksFileChanged || currentBookmarkFileChanged || tagsFileChanged || diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/roots/HgIntegrationEnabler.java b/plugins/hg4idea/src/org/zmlx/hg4idea/roots/HgIntegrationEnabler.java new file mode 100644 index 000000000000..853c4d00ddc6 --- /dev/null +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/roots/HgIntegrationEnabler.java @@ -0,0 +1,60 @@ +/* + * Copyright 2000-2014 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 org.zmlx.hg4idea.roots; + +import com.intellij.openapi.vcs.VcsNotifier; +import com.intellij.openapi.vcs.roots.VcsIntegrationEnabler; +import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.zmlx.hg4idea.HgVcs; +import org.zmlx.hg4idea.HgVcsMessages; +import org.zmlx.hg4idea.command.HgInitCommand; +import org.zmlx.hg4idea.execution.HgCommandResult; +import org.zmlx.hg4idea.execution.HgCommandResultHandler; +import org.zmlx.hg4idea.util.HgErrorUtil; + +public class HgIntegrationEnabler extends VcsIntegrationEnabler<HgVcs> { + + public HgIntegrationEnabler(@NotNull HgVcs vcs) { + super(vcs); + } + + @Override + protected boolean initOrNotifyError(@NotNull final VirtualFile projectDir) { + final boolean[] success = new boolean[1]; + new HgInitCommand(myProject).execute(projectDir, new HgCommandResultHandler() { + @Override + public void process(@Nullable HgCommandResult result) { + VcsNotifier notification = VcsNotifier.getInstance(myProject); + if (!HgErrorUtil.hasErrorsInCommandExecution(result)) { + success[0] = true; + notification.notifySuccess(HgVcsMessages.message("hg4idea.init.created.notification.title"), + HgVcsMessages + .message("hg4idea.init.created.notification.description", projectDir.getPresentableUrl()) + ); + } + else { + success[0] = false; + String errors = result != null ? result.getRawError() : ""; + notification.notifyError( + HgVcsMessages.message("hg4idea.init.error.description", projectDir.getPresentableUrl()), errors); + } + } + }); + return success[0]; + } +} diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.form b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.form deleted file mode 100644 index 34b0d83022ba..000000000000 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.form +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.zmlx.hg4idea.ui.HgUpdateDialog"> - <grid id="27dc6" binding="contentPane" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> - <margin top="0" left="0" bottom="0" right="0"/> - <constraints> - <xy x="20" y="20" width="500" height="400"/> - </constraints> - <properties/> - <border type="none"/> - <children> - <component id="6a810" class="javax.swing.JCheckBox" binding="pullCheckBox" default-binding="true"> - <constraints> - <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> - </constraints> - <properties> - <text value="&pull"/> - <toolTipText value="pull from the default remote repository"/> - </properties> - </component> - <hspacer id="732d8"> - <constraints> - <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/> - </constraints> - </hspacer> - <component id="2555e" class="javax.swing.JCheckBox" binding="updateCheckBox" default-binding="true"> - <constraints> - <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> - </constraints> - <properties> - <text value="&update"/> - <toolTipText value="update to the head of the current branch"/> - </properties> - </component> - <component id="3a607" class="javax.swing.JCheckBox" binding="mergeCheckBox" default-binding="true"> - <constraints> - <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> - </constraints> - <properties> - <text value="&merge"/> - <toolTipText value="merge if pulling resulted in extra heads"/> - </properties> - </component> - <component id="6499c" class="javax.swing.JCheckBox" binding="commitAfterMergeCheckBox" default-binding="true"> - <constraints> - <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> - </constraints> - <properties> - <text value="&commit after merge without conflicts"/> - <toolTipText value="commit automatically after the merge"/> - </properties> - </component> - <vspacer id="26be6"> - <constraints> - <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/> - </constraints> - </vspacer> - </children> - </grid> -</form> diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.java index 168954e1cddd..de4b865e5ca7 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.java @@ -12,6 +12,8 @@ // limitations under the License. package org.zmlx.hg4idea.ui; +import com.intellij.ui.IdeBorderFactory; +import net.miginfocom.swing.MigLayout; import org.zmlx.hg4idea.provider.update.HgUpdater; import javax.swing.*; @@ -22,45 +24,62 @@ import java.awt.event.ItemListener; * Configuration dialog for the update process. */ public class HgUpdateDialog { - private JPanel contentPane; - private JCheckBox pullCheckBox; - private JCheckBox updateCheckBox; - private JCheckBox mergeCheckBox; - private JCheckBox commitAfterMergeCheckBox; + private JCheckBox myCommitAfterMergeCheckBox; + private JRadioButton myMergeRadioButton; + private JRadioButton myRebaseRadioButton; + public HgUpdateDialog() { - ItemListener enabledListener = new ItemListener() { - public void itemStateChanged(ItemEvent e) { - updateEnabledStates(); - } - }; - updateCheckBox.addItemListener(enabledListener); - mergeCheckBox.addItemListener(enabledListener); - updateEnabledStates(); + createCenterPanel(); } private void updateEnabledStates() { - //TODO this information is actually duplicated in the HgRegularUpdater (as a series of nested ifs) - mergeCheckBox.setEnabled(updateCheckBox.isSelected()); - commitAfterMergeCheckBox.setEnabled(mergeCheckBox.isEnabled() && mergeCheckBox.isSelected()); + myCommitAfterMergeCheckBox.setEnabled(myMergeRadioButton.isSelected()); } public void applyTo(HgUpdater.UpdateConfiguration updateConfiguration) { - updateConfiguration.setShouldPull(pullCheckBox.isSelected()); - updateConfiguration.setShouldUpdate(updateCheckBox.isSelected()); - updateConfiguration.setShouldMerge(mergeCheckBox.isSelected()); - updateConfiguration.setShouldCommitAfterMerge(commitAfterMergeCheckBox.isSelected()); + updateConfiguration.setShouldMerge(myMergeRadioButton.isSelected()); + updateConfiguration.setShouldCommitAfterMerge(myCommitAfterMergeCheckBox.isSelected()); + updateConfiguration.setShouldRebase(myRebaseRadioButton.isSelected()); } public JComponent createCenterPanel() { + MigLayout migLayout = new MigLayout("flowy,ins 0, fill"); + JPanel contentPane = new JPanel(migLayout); + + + + contentPane.setBorder(IdeBorderFactory.createTitledBorder("Update Type")); + + myMergeRadioButton = new JRadioButton("Merge", true); + myMergeRadioButton.setMnemonic('m'); + myMergeRadioButton.setToolTipText("Merge if pulling resulted in extra heads"); + myCommitAfterMergeCheckBox = new JCheckBox("Commit after merge without conflicts", false); + myCommitAfterMergeCheckBox.setMnemonic('c'); + myCommitAfterMergeCheckBox.setToolTipText("Commit automatically after the merge"); + myRebaseRadioButton = new JRadioButton("Rebase", false); + myRebaseRadioButton.setToolTipText("Rebase changesets to a branch tip as destination"); + myRebaseRadioButton.setMnemonic('r'); + final ButtonGroup radioButtonGroup = new ButtonGroup(); + radioButtonGroup.add(myMergeRadioButton); + radioButtonGroup.add(myRebaseRadioButton); + + contentPane.add(myMergeRadioButton, "left"); + contentPane.add(myCommitAfterMergeCheckBox, "gapx 5%"); + contentPane.add(myRebaseRadioButton, "left"); + myMergeRadioButton.addItemListener(new ItemListener() { + public void itemStateChanged(ItemEvent e) { + updateEnabledStates(); + } + }); + + updateEnabledStates(); return contentPane; } public void updateFrom(HgUpdater.UpdateConfiguration updateConfiguration) { - pullCheckBox.setSelected(updateConfiguration.shouldPull()); - updateCheckBox.setSelected(updateConfiguration.shouldUpdate()); - mergeCheckBox.setSelected(updateConfiguration.shouldMerge()); - commitAfterMergeCheckBox.setSelected(updateConfiguration.shouldCommitAfterMerge()); + myMergeRadioButton.setSelected(updateConfiguration.shouldMerge()); + myCommitAfterMergeCheckBox.setSelected(updateConfiguration.shouldCommitAfterMerge()); + myRebaseRadioButton.setSelected(updateConfiguration.shouldRebase()); } - } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgHistoryUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgHistoryUtil.java index 2847323b2174..ba72f36f50c0 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgHistoryUtil.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgHistoryUtil.java @@ -142,10 +142,10 @@ public class HgHistoryUtil { @NotNull public static List<TimedVcsCommit> readAllHashes(@NotNull Project project, @NotNull VirtualFile root, - @NotNull final Consumer<VcsUser> userRegistry) throws VcsException { + @NotNull final Consumer<VcsUser> userRegistry, List<String> params) throws VcsException { final VcsLogObjectsFactory factory = ServiceManager.getService(project, VcsLogObjectsFactory.class); - return ContainerUtil.map(getCommittedChangeList(project, root, -1, false, Collections.<String>emptyList()), new Function<HgCommittedChangeList, TimedVcsCommit>() { + return ContainerUtil.map(getCommittedChangeList(project, root, -1, false, params), new Function<HgCommittedChangeList, TimedVcsCommit>() { @Override public TimedVcsCommit fun(HgCommittedChangeList record) { HgRevisionNumber revNumber = (HgRevisionNumber)record.getRevisionNumber(); diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java index ee7f1b4f5ce4..ad28fd7a9936 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java @@ -571,7 +571,7 @@ public abstract class HgUtil { public static String getDisplayableBranchOrBookmarkText(@NotNull HgRepository repository) { HgRepository.State state = repository.getState(); String branchText = ""; - if (state == HgRepository.State.MERGING) { + if (state != HgRepository.State.NORMAL) { branchText += state.toString() + " "; } String branchOrBookMarkName = repository.getCurrentBookmark(); diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgUpdateTest.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgUpdateTest.java index 8ab8cd367763..456ad4aac580 100644 --- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgUpdateTest.java +++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgUpdateTest.java @@ -60,7 +60,6 @@ public class HgUpdateTest extends HgCollaborativeTest { //do a simple pull without an update HgPullCommand pull = new HgPullCommand(myProject, projectRepoVirtualFile); pull.setSource(HgUtil.getRepositoryDefaultPath(myProject, projectRepoVirtualFile)); - pull.setUpdate(false); pull.execute(); assertEquals( determineNumberOfIncomingChanges( projectRepo ), 0, diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxFileReferenceProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxFileReferenceProvider.java index b419e2bfd68f..9a27f6e904c7 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxFileReferenceProvider.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxFileReferenceProvider.java @@ -36,7 +36,7 @@ public class JavaFxFileReferenceProvider extends PsiReferenceProvider { return value; } - public static PsiReference[] getReferences(final PsiElement element, String value, final String acceptedExtension) { + public static PsiReference[] getReferences(@NotNull PsiElement element, String value, final String acceptedExtension) { final PsiDirectory directory = element.getContainingFile().getOriginalFile().getParent(); if (directory == null) return PsiReference.EMPTY_ARRAY; final boolean startsWithSlash = value.startsWith("/"); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxLocationReferenceProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxLocationReferenceProvider.java index a6f84fed2d47..ddfba6a6aaa9 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxLocationReferenceProvider.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxLocationReferenceProvider.java @@ -78,7 +78,7 @@ class JavaFxLocationReferenceProvider extends PsiReferenceProvider { } } - private static PsiReference[] collectRefs(PsiElement element, String value, final int startInElement, final FileType... acceptedFileTypes) { + private static PsiReference[] collectRefs(@NotNull PsiElement element, String value, final int startInElement, final FileType... acceptedFileTypes) { final FileReferenceSet set = new FileReferenceSet(value, element, startInElement, null, true){ @Override protected Condition<PsiFileSystemItem> getReferenceCompletionFilter() { diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java index 929a7a078f7a..4c7ef2c1590f 100644 --- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java +++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java @@ -19,8 +19,7 @@ import org.jetbrains.jps.maven.model.impl.*; import java.io.File; import java.io.IOException; import java.io.UnsupportedEncodingException; -import java.util.Arrays; -import java.util.Collections; +import java.util.*; /** * @author Eugene Zhuravlev @@ -34,7 +33,7 @@ public class MavenResourcesBuilder extends TargetBuilder<MavenResourceRootDescri } @Override - public void build(@NotNull MavenResourcesTarget target, @NotNull final DirtyFilesHolder<MavenResourceRootDescriptor, MavenResourcesTarget> holder, @NotNull final BuildOutputConsumer outputConsumer, @NotNull final CompileContext context) throws ProjectBuildException, IOException { + public void build(@NotNull final MavenResourcesTarget target, @NotNull final DirtyFilesHolder<MavenResourceRootDescriptor, MavenResourcesTarget> holder, @NotNull final BuildOutputConsumer outputConsumer, @NotNull final CompileContext context) throws ProjectBuildException, IOException { final BuildDataPaths dataPaths = context.getProjectDescriptor().dataManager.getDataPaths(); final MavenProjectConfiguration projectConfig = JpsMavenExtensionService.getInstance().getMavenProjectConfiguration(dataPaths); final MavenModuleResourceConfiguration config = target.getModuleResourcesConfiguration(dataPaths); @@ -42,21 +41,63 @@ public class MavenResourcesBuilder extends TargetBuilder<MavenResourceRootDescri return; } - final MavenResourceFileProcessor fileProcessor = new MavenResourceFileProcessor(projectConfig, target.getModule().getProject(), config); + final Map<MavenResourceRootDescriptor, List<File>> files = new HashMap<MavenResourceRootDescriptor, List<File>>(); + holder.processDirtyFiles(new FileProcessor<MavenResourceRootDescriptor, MavenResourcesTarget>() { @Override - public boolean apply(MavenResourcesTarget target, File file, MavenResourceRootDescriptor rd) throws IOException { - final String relPath = FileUtil.getRelativePath(rd.getRootFile(), file); + public boolean apply(MavenResourcesTarget t, File file, MavenResourceRootDescriptor rd) throws IOException { + assert target == t; + + List<File> fileList = files.get(rd); + if (fileList == null) { + fileList = new ArrayList<File>(); + files.put(rd, fileList); + } + + fileList.add(file); + return true; + } + }); + + MavenResourceRootDescriptor[] roots = files.keySet().toArray(new MavenResourceRootDescriptor[files.keySet().size()]); + Arrays.sort(roots, new Comparator<MavenResourceRootDescriptor>() { + @Override + public int compare(MavenResourceRootDescriptor r1, MavenResourceRootDescriptor r2) { + int res = r1.getIndexInPom() - r2.getIndexInPom(); + + if (r1.isOverwrite()) { + assert r2.isOverwrite(); // 'overwrite' parameters is common for all roots in module. + + return res; + } + + if (r1.getConfiguration().isFiltered && !r2.getConfiguration().isFiltered) return 1; + if (!r1.getConfiguration().isFiltered && r2.getConfiguration().isFiltered) return -1; + + if (!r1.getConfiguration().isFiltered) { + res = -res; + } + + return res; + } + }); + + MavenResourceFileProcessor fileProcessor = new MavenResourceFileProcessor(projectConfig, target.getModule().getProject(), config); + + for (MavenResourceRootDescriptor rd : roots) { + for (File file : files.get(rd)) { + + String relPath = FileUtil.getRelativePath(rd.getRootFile(), file); if (relPath == null) { - return true; + continue; } final File outputDir = MavenResourcesTarget.getOutputDir(target.getModuleOutputDir(), rd.getConfiguration()); if (outputDir == null) { - return true; + continue; } - final File outputFile = new File(outputDir, relPath); - final String sourcePath = file.getPath(); + File outputFile = new File(outputDir, relPath); + String sourcePath = file.getPath(); try { context.processMessage(new ProgressMessage("Copying resources... [" + target.getModule().getName() + "]")); @@ -67,16 +108,18 @@ public class MavenResourcesBuilder extends TargetBuilder<MavenResourceRootDescri context.processMessage( new CompilerMessage(BUILDER_NAME, BuildMessage.Kind.INFO, "Resource was not copied: " + e.getMessage(), sourcePath)); } - return !context.getCancelStatus().isCanceled(); + + if (context.getCancelStatus().isCanceled()) { + return; + } } - }); + } context.checkCanceled(); context.processMessage(new ProgressMessage("")); } - @NotNull public String getPresentableName() { return BUILDER_NAME; diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenModuleResourceConfiguration.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenModuleResourceConfiguration.java index 62f8922e03d5..29abf37a8be5 100644 --- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenModuleResourceConfiguration.java +++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenModuleResourceConfiguration.java @@ -63,6 +63,9 @@ public class MavenModuleResourceConfiguration { @OptionTag public boolean escapeWindowsPaths = true; + @OptionTag + public boolean overwrite; + @Tag("resources") @AbstractCollection(surroundWithTag = false, elementTag = "resource") public List<ResourceRootConfiguration> resources = new ArrayList<ResourceRootConfiguration>(); @@ -102,6 +105,7 @@ public class MavenModuleResourceConfiguration { result = 31 * result + filteringExclusions.hashCode(); result = 31 * result + (escapeString != null ? escapeString.hashCode() : 0); result = 31 * result + (escapeWindowsPaths ? 1 : 0); + result = 31 * result + (overwrite ? 1 : 0); return result; } } diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenResourceRootDescriptor.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenResourceRootDescriptor.java index 1e61c31b7c7f..1def0bc0a73c 100644 --- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenResourceRootDescriptor.java +++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenResourceRootDescriptor.java @@ -31,13 +31,21 @@ public class MavenResourceRootDescriptor extends BuildRootDescriptor { private final ResourceRootConfiguration myConfig; private final File myFile; private final String myId; + private final boolean myOverwrite; - public MavenResourceRootDescriptor(@NotNull MavenResourcesTarget target, ResourceRootConfiguration config) { + private final int myIndexInPom; + + public MavenResourceRootDescriptor(@NotNull MavenResourcesTarget target, + ResourceRootConfiguration config, + int indexInPom, + boolean overwrite) { myTarget = target; myConfig = config; final String path = FileUtil.toCanonicalPath(config.directory); myFile = new File(path); myId = path; + myIndexInPom = indexInPom; + myOverwrite = overwrite; } public ResourceRootConfiguration getConfiguration() { @@ -69,4 +77,12 @@ public class MavenResourceRootDescriptor extends BuildRootDescriptor { public boolean canUseFileCache() { return true; } + + public int getIndexInPom() { + return myIndexInPom; + } + + public boolean isOverwrite() { + return myOverwrite; + } } diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenResourcesTarget.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenResourcesTarget.java index ccb6c7ab4eae..bf89e9696af7 100644 --- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenResourcesTarget.java +++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenResourcesTarget.java @@ -65,8 +65,15 @@ public class MavenResourcesTarget extends ModuleBasedTarget<MavenResourceRootDes public List<MavenResourceRootDescriptor> computeRootDescriptors(JpsModel model, ModuleExcludeIndex index, IgnoredFileIndex ignoredFileIndex, BuildDataPaths dataPaths) { // todo: should we honor ignored and excluded roots here? final List<MavenResourceRootDescriptor> result = new ArrayList<MavenResourceRootDescriptor>(); - for (ResourceRootConfiguration resource : getRootConfigurations(dataPaths)) { - result.add(new MavenResourceRootDescriptor(this, resource)); + + MavenProjectConfiguration projectConfig = JpsMavenExtensionService.getInstance().getMavenProjectConfiguration(dataPaths); + MavenModuleResourceConfiguration moduleConfig = projectConfig.moduleConfigurations.get(myModule.getName()); + if (moduleConfig == null) return Collections.emptyList(); + + int i = 0; + + for (ResourceRootConfiguration resource : getRootConfigurations(moduleConfig)) { + result.add(new MavenResourceRootDescriptor(this, resource, i++, moduleConfig.overwrite)); } return result; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/annotator/MavenDomGutterAnnotator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/annotator/MavenDomGutterAnnotator.java index 40b3f8f0bbd0..952ae7039862 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/annotator/MavenDomGutterAnnotator.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/annotator/MavenDomGutterAnnotator.java @@ -31,6 +31,7 @@ import com.intellij.util.xml.DomElement; import com.intellij.util.xml.DomManager; import icons.MavenIcons; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.maven.dom.MavenDomBundle; import org.jetbrains.idea.maven.dom.MavenDomProjectProcessorUtils; import org.jetbrains.idea.maven.dom.MavenDomUtil; @@ -40,7 +41,6 @@ import org.jetbrains.idea.maven.project.MavenProject; import javax.swing.*; import java.util.Collection; import java.util.Collections; -import java.util.List; import java.util.Set; public class MavenDomGutterAnnotator implements Annotator { @@ -66,26 +66,22 @@ public class MavenDomGutterAnnotator implements Annotator { final XmlTag tag = dependency.getXmlTag(); if (tag == null) return; - final List<MavenDomDependency> children = getManagingDependencies(dependency); - if (children.size() > 0) { + MavenDomDependency managingDependency = getManagingDependency(dependency); + if (managingDependency != null) { final NavigationGutterIconBuilder<MavenDomDependency> iconBuilder = NavigationGutterIconBuilder.create(AllIcons.General.OverridingMethod, DependencyConverter.INSTANCE); iconBuilder. - setTargets(children). - setTooltipText(MavenDomBundle.message("overriden.dependency.title")). + setTargets(managingDependency). + setTooltipText(generateTooltip(managingDependency)). install(holder, tag); } } - private static List<MavenDomDependency> getManagingDependencies(@NotNull MavenDomDependency dependency) { + @Nullable + private static MavenDomDependency getManagingDependency(@NotNull MavenDomDependency dependency) { Project project = dependency.getManager().getProject(); - MavenDomDependency parentDependency = MavenDomProjectProcessorUtils.searchManagingDependency(dependency, project); - - if (parentDependency != null) { - return Collections.singletonList(parentDependency); - } - return Collections.emptyList(); + return MavenDomProjectProcessorUtils.searchManagingDependency(dependency, project); } public void annotate(@NotNull PsiElement psiElement, @NotNull AnnotationHolder holder) { @@ -191,6 +187,38 @@ public class MavenDomGutterAnnotator implements Annotator { return dependency.getParentOfType(MavenDomDependencyManagement.class, false) != null; } + private static String generateTooltip(MavenDomDependency dependency) { + StringBuilder res = new StringBuilder(); + + res.append("<dependency>\n"); + res.append(" <groupId>").append(dependency.getGroupId().getStringValue()).append("</groupId>\n"); + res.append(" <artifactId>").append(dependency.getArtifactId().getStringValue()).append("</artifactId>\n"); + + if (dependency.getType().getXmlElement() != null) { + res.append(" <type>").append(dependency.getType().getStringValue()).append("</type>\n"); + } + + if (dependency.getClassifier().getXmlElement() != null) { + res.append(" <classifier>").append(dependency.getClassifier().getStringValue()).append("</classifier>\n"); + } + + if (dependency.getScope().getXmlElement() != null) { + res.append(" <scope>").append(dependency.getScope().getStringValue()).append("</scope>\n"); + } + + if (dependency.getOptional().getXmlElement() != null) { + res.append(" <optional>").append(dependency.getOptional().getStringValue()).append("</optional>\n"); + } + + if (dependency.getVersion().getXmlElement() != null) { + res.append(" <version>").append(dependency.getVersion().getStringValue()).append("</version>\n"); + } + + res.append("</dependency>"); + + return res.toString(); + } + private static class MyListCellRenderer extends PsiElementListCellRenderer<XmlTag> { public static final MyListCellRenderer INSTANCE = new MyListCellRenderer(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java index e595e1fa3788..d2e0514acc48 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java @@ -146,7 +146,7 @@ public class IntroducePropertyAction extends BaseRefactoringAction { if (model == null || StringUtil.isEmptyOrSpaces(selectedString) || - isInsideTextRanges(ranges, offsetInElement, offsetInElement + selectedString.length())) { + isIntersectWithRanges(ranges, offsetInElement, offsetInElement + selectedString.length())) { return; } @@ -332,7 +332,7 @@ public class IntroducePropertyAction extends BaseRefactoringAction { do { int end = start + mySelectedString.length(); - boolean isInsideProperty = isInsideTextRanges(ranges, start, end); + boolean isInsideProperty = isIntersectWithRanges(ranges, start, end); if (!isInsideProperty) { usages .add(new UsageInfo(containingFile, elementTextRange.getStartOffset() + start, elementTextRange.getStartOffset() + end)); @@ -370,12 +370,21 @@ public class IntroducePropertyAction extends BaseRefactoringAction { return ranges; } - private static boolean isInsideTextRanges(@NotNull Collection<TextRange> ranges, int start, int end) { + private static boolean isIntersectWithRanges(@NotNull Collection<TextRange> ranges, int start, int end) { for (TextRange range : ranges) { - if ((start >= range.getStartOffset() && (end <= range.getEndOffset() || start <= range.getEndOffset())) || - (end <= range.getEndOffset() && (end > range.getStartOffset()))) { - return true; + if (start <= range.getStartOffset() && end >= range.getEndOffset()) { + continue; // range is inside [start, end] } + + if (end <= range.getStartOffset()) { + continue; // range is on right + } + + if (start >= range.getEndOffset()) { + continue; // range is on right + } + + return true; } return false; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReference.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReference.java index cee35f91c019..bebd44da248c 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReference.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReference.java @@ -32,6 +32,7 @@ import com.intellij.psi.xml.XmlTagChild; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.PlatformIcons; +import com.intellij.util.Processor; import com.intellij.util.xml.DomElement; import com.intellij.util.xml.DomUtil; import com.intellij.xml.XmlElementDescriptor; @@ -43,12 +44,14 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.maven.dom.MavenDomProjectProcessorUtils; import org.jetbrains.idea.maven.dom.MavenDomUtil; import org.jetbrains.idea.maven.dom.MavenSchemaProvider; +import org.jetbrains.idea.maven.dom.model.MavenDomConfiguration; import org.jetbrains.idea.maven.dom.model.MavenDomProfile; import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel; import org.jetbrains.idea.maven.dom.model.MavenDomSettingsModel; import org.jetbrains.idea.maven.execution.MavenRunner; import org.jetbrains.idea.maven.execution.MavenRunnerSettings; import org.jetbrains.idea.maven.model.MavenId; +import org.jetbrains.idea.maven.plugins.api.MavenPluginDescriptor; import org.jetbrains.idea.maven.project.MavenProject; import org.jetbrains.idea.maven.utils.MavenUtil; import org.jetbrains.idea.maven.vfs.MavenPropertiesVirtualFileSystem; @@ -182,6 +185,27 @@ public class MavenPropertyPsiReference extends MavenPsiReference { if (result != null) return result; } + MavenDomConfiguration pluginCfg = DomUtil.findDomElement(myElement, MavenDomConfiguration.class); + if (pluginCfg != null) { + boolean notFound = MavenPluginDescriptor.processDescriptors(new Processor<MavenPluginDescriptor>() { + @Override + public boolean process(MavenPluginDescriptor descriptor) { + if (descriptor.properties != null) { + for (MavenPluginDescriptor.ModelProperty property : descriptor.properties) { + if (property.insideConfigurationOnly && property.name.equals(myText)) { + return false; + } + } + } + return true; + } + }, pluginCfg); + + if (!notFound) { + return myElement; + } + } + if (myProjectDom != null) { PsiElement result = MavenDomProjectProcessorUtils.searchProperty(myText, myProjectDom, myProject); if (result != null) return result; @@ -393,6 +417,23 @@ public class MavenPropertyPsiReference extends MavenPsiReference { } } } + + MavenDomConfiguration pluginCfg = DomUtil.findDomElement(myElement, MavenDomConfiguration.class); + if (pluginCfg != null) { + MavenPluginDescriptor.processDescriptors(new Processor<MavenPluginDescriptor>() { + @Override + public boolean process(MavenPluginDescriptor descriptor) { + if (descriptor.properties != null) { + for (MavenPluginDescriptor.ModelProperty property : descriptor.properties) { + if (property.insideConfigurationOnly) { + result.add(LookupElementBuilder.create(property.name).withIcon(PlatformIcons.PROPERTY_ICON)); + } + } + } + return true; + } + }, pluginCfg); + } } private static void addVariant(List<Object> result, String name, @NotNull Object element, @Nullable String prefix, @NotNull Icon icon) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenJUnitPatcher.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenJUnitPatcher.java index 0dbfc4f5e21b..d28c86af9f71 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenJUnitPatcher.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenJUnitPatcher.java @@ -56,7 +56,7 @@ public class MavenJUnitPatcher extends JUnitPatcher { path = MavenPropertyResolver.resolve(path, domModel); } - javaParameters.getClassPath().add(path); + javaParameters.getClassPath().add(resolveSurefireProperties(path)); } } @@ -66,7 +66,7 @@ public class MavenJUnitPatcher extends JUnitPatcher { String propertyName = element.getName(); if (!javaParameters.getVMParametersList().hasProperty(propertyName)) { - javaParameters.getVMParametersList().addProperty(propertyName, element.getValue()); + javaParameters.getVMParametersList().addProperty(propertyName, resolveSurefireProperties(element.getValue())); } } } @@ -77,7 +77,7 @@ public class MavenJUnitPatcher extends JUnitPatcher { String variableName = element.getName(); if (javaParameters.getEnv() == null || !javaParameters.getEnv().containsKey(variableName)) { - javaParameters.addEnv(variableName, element.getValue()); + javaParameters.addEnv(variableName, resolveSurefireProperties(element.getValue())); } } } @@ -86,11 +86,15 @@ public class MavenJUnitPatcher extends JUnitPatcher { if (argLine != null && isEnabled("argLine")) { String value = argLine.getTextTrim(); if (StringUtil.isNotEmpty(value)) { - javaParameters.getVMParametersList().addParametersString(value); + javaParameters.getVMParametersList().addParametersString(resolveSurefireProperties(value)); } } } + private static String resolveSurefireProperties(String value) { + return value.replaceAll("\\$\\{surefire\\.(forkNumber|threadNumber)\\}", "1"); + } + private static boolean isEnabled(String s) { return !Boolean.valueOf(System.getProperty("idea.maven.surefire.disable." + s)); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/FacetImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/FacetImporter.java index 97057bb43bcd..38f9db77d711 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/FacetImporter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/FacetImporter.java @@ -20,6 +20,7 @@ import com.intellij.framework.FrameworkType; import com.intellij.framework.detection.DetectionExcludesConfiguration; import com.intellij.framework.detection.impl.FrameworkDetectionUtil; import com.intellij.openapi.module.Module; +import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ArrayUtil; @@ -67,8 +68,11 @@ public abstract class FacetImporter<FACET_TYPE extends Facet, FACET_CONFIG_TYPE MavenProjectChanges changes, MavenModifiableModelsProvider modifiableModelsProvider) { prepareImporter(mavenProject); - disableFacetAutodetection(module, modifiableModelsProvider); - ensureFacetExists(module, mavenProject, modifiableModelsProvider); + + if (!isFacetDetectionDisabled(module.getProject())) { + disableFacetAutodetection(module, modifiableModelsProvider); + ensureFacetExists(module, mavenProject, modifiableModelsProvider); + } } private void ensureFacetExists(Module module, MavenProject mavenProject, MavenModifiableModelsProvider modifiableModelsProvider) { @@ -109,7 +113,9 @@ public abstract class FacetImporter<FACET_TYPE extends Facet, FACET_CONFIG_TYPE FACET_TYPE f = findFacet(modifiableModelsProvider.getFacetModel(module)); if (f == null) return; // facet may has been removed between preProcess and process calls - reimportFacet(modifiableModelsProvider, module, rootModel, f, mavenModel, mavenProject, changes, mavenProjectToModuleName, postTasks); + if (!isFacetDetectionDisabled(module.getProject())) { + reimportFacet(modifiableModelsProvider, module, rootModel, f, mavenModel, mavenProject, changes, mavenProjectToModuleName, postTasks); + } } private FACET_TYPE findFacet(FacetModel model) { @@ -170,4 +176,12 @@ public abstract class FacetImporter<FACET_TYPE extends Facet, FACET_CONFIG_TYPE protected String getTargetExtension(MavenProject p) { return p.getPackaging(); } + + protected boolean isFacetDetectionDisabled(Project project) { + final DetectionExcludesConfiguration excludesConfiguration = DetectionExcludesConfiguration.getInstance(project); + final FrameworkType frameworkType = FrameworkDetectionUtil.findFrameworkTypeForFacetDetector(myFacetType); + if (frameworkType == null) return false; + + return excludesConfiguration.isExcludedFromDetection(frameworkType); + } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImporter.java index 08117ac14be4..f2e55d189ad1 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImporter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImporter.java @@ -50,15 +50,25 @@ public abstract class MavenImporter { } public static List<MavenImporter> getSuitableImporters(MavenProject p) { - final List<MavenImporter> result = new ArrayList<MavenImporter>(); - final Set<ModuleType> moduleTypes = new THashSet<ModuleType>(); + List<MavenImporter> result = null; + Set<ModuleType> moduleTypes = null; + for (MavenImporter importer : EXTENSION_POINT_NAME.getExtensions()) { if (importer.isApplicable(p)) { + if (result == null) { + result = new ArrayList<MavenImporter>(); + moduleTypes = new THashSet<ModuleType>(); + } + result.add(importer); moduleTypes.add(importer.getModuleType()); } } + if (result == null) { + return Collections.emptyList(); + } + if (moduleTypes.size() <= 1) { return result; } @@ -67,8 +77,9 @@ public abstract class MavenImporter { // Now we select one module type and return only those importers that are ok with it. // If possible - return at least one importer that explicitly supports packaging of the given maven project. ModuleType moduleType = result.get(0).getModuleType(); + List<String> supportedPackagings = new ArrayList<String>(); for (MavenImporter importer : result) { - final List<String> supportedPackagings = new ArrayList<String>(); + supportedPackagings.clear(); importer.getSupportedPackagings(supportedPackagings); if (supportedPackagings.contains(p.getPackaging())) { moduleType = importer.getModuleType(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenModelPropertiesPatcher.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenModelPropertiesPatcher.java index 047fc823199b..04039a2f95f9 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenModelPropertiesPatcher.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenModelPropertiesPatcher.java @@ -47,8 +47,8 @@ public class MavenModelPropertiesPatcher { for (MavenPluginDescriptor descriptor : descriptors) { if (descriptor.properties != null) { for (MavenPluginDescriptor.ModelProperty property : descriptor.properties) { - if (StringUtil.isNotEmpty(property.name)) { - modelProperties.setProperty(property.name, ""); + if (!property.insideConfigurationOnly && StringUtil.isNotEmpty(property.name)) { + modelProperties.setProperty(property.name, StringUtil.notNullize(property.value)); } } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenPluginDescriptor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenPluginDescriptor.java index 56bc0fdf0c33..49b8b995dd9f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenPluginDescriptor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenPluginDescriptor.java @@ -18,12 +18,19 @@ package org.jetbrains.idea.maven.plugins.api; import com.intellij.openapi.extensions.AbstractExtensionPointBean; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.util.Pair; +import com.intellij.util.Processor; import com.intellij.util.SmartList; +import com.intellij.util.xml.DomElement; +import com.intellij.util.xml.DomUtil; import com.intellij.util.xml.Required; import com.intellij.util.xmlb.annotations.AbstractCollection; import com.intellij.util.xmlb.annotations.Attribute; import com.intellij.util.xmlb.annotations.Property; import com.intellij.util.xmlb.annotations.Tag; +import org.jetbrains.idea.maven.dom.model.MavenDomConfiguration; +import org.jetbrains.idea.maven.dom.model.MavenDomGoal; +import org.jetbrains.idea.maven.dom.model.MavenDomPlugin; +import org.jetbrains.idea.maven.dom.model.MavenDomPluginExecution; import org.jetbrains.idea.maven.utils.MavenUtil; import java.util.HashMap; @@ -63,6 +70,12 @@ public class MavenPluginDescriptor extends AbstractExtensionPointBean { @Attribute("name") @Required public String name; + + @Attribute + public String value; + + @Attribute + public boolean insideConfigurationOnly; } @Tag("param") @@ -144,4 +157,39 @@ public class MavenPluginDescriptor extends AbstractExtensionPointBean { return res; } + + public static boolean processDescriptors(Processor<MavenPluginDescriptor> processor, MavenDomConfiguration cfg) { + Map<String, Map<String, Map<String, List<MavenPluginDescriptor>>>> map = getDescriptorsMap(); + + DomElement parent = cfg.getParent(); + + MavenDomPlugin plugin = DomUtil.getParentOfType(parent, MavenDomPlugin.class, false); + if (plugin == null) return true; + + Map<String, Map<String, List<MavenPluginDescriptor>>> groupMap = map.get(plugin.getArtifactId().getStringValue()); + if (groupMap == null) return true; + + Map<String, List<MavenPluginDescriptor>> goalsMap = groupMap.get(plugin.getGroupId().getStringValue()); + if (goalsMap == null) return true; + + List<MavenPluginDescriptor> descriptorsForAllGoals = goalsMap.get(null); + if (descriptorsForAllGoals != null) { + for (MavenPluginDescriptor descriptor : descriptorsForAllGoals) { + if (!processor.process(descriptor)) return false; + } + } + + if (parent instanceof MavenDomPluginExecution) { + for (MavenDomGoal goal : ((MavenDomPluginExecution)parent).getGoals().getGoals()) { + List<MavenPluginDescriptor> descriptors = goalsMap.get(goal.getStringValue()); + if (descriptors != null) { + for (MavenPluginDescriptor descriptor : descriptors) { + if (!processor.process(descriptor)) return false; + } + } + } + } + + return true; + } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/GroovyEclipseCompilerImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/GroovyEclipseCompilerImporter.java new file mode 100644 index 000000000000..518c63c9e949 --- /dev/null +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/GroovyEclipseCompilerImporter.java @@ -0,0 +1,45 @@ +/* + * Copyright 2000-2014 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 org.jetbrains.idea.maven.plugins.groovy; + +import org.jetbrains.idea.maven.importing.GroovyImporter; +import org.jetbrains.idea.maven.model.MavenId; +import org.jetbrains.idea.maven.model.MavenPlugin; +import org.jetbrains.idea.maven.project.MavenProject; + +/** + * @author Sergey Evdokimov + */ +public class GroovyEclipseCompilerImporter extends GroovyImporter { + + public GroovyEclipseCompilerImporter() { + super("org.apache.maven.plugins", "maven-compiler-plugin"); + } + + @Override + public boolean isApplicable(MavenProject mavenProject) { + MavenPlugin compilerPlugin = mavenProject.findPlugin("org.apache.maven.plugins", "maven-compiler-plugin"); + if (compilerPlugin == null) return false; + + for(MavenId id : compilerPlugin.getDependencies()) { + if ("groovy-eclipse-compiler".equals(id.getArtifactId()) && "org.codehaus.groovy".equals(id.getGroupId())) { + return true; + } + } + + return false; + } +} diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java index 600c9f51df45..4dc7a21f7a81 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java @@ -135,6 +135,11 @@ public class MavenResourceCompilerConfigurationGenerator { resourceConfig.escapeWindowsPaths = Boolean.parseBoolean(escapeWindowsPaths); } + String overwrite = MavenJDOMUtil.findChildValueByPath(pluginConfiguration, "overwrite"); + if (overwrite != null) { + resourceConfig.overwrite = Boolean.parseBoolean(overwrite); + } + projectConfig.moduleConfigurations.put(module.getName(), resourceConfig); } diff --git a/plugins/maven/src/main/resources/META-INF/groovy-support.xml b/plugins/maven/src/main/resources/META-INF/groovy-support.xml index 3dc7ba1eebdb..790e66fe9015 100644 --- a/plugins/maven/src/main/resources/META-INF/groovy-support.xml +++ b/plugins/maven/src/main/resources/META-INF/groovy-support.xml @@ -3,6 +3,7 @@ <importer implementation="org.jetbrains.idea.maven.plugins.groovy.Groovy_1_0_Importer"/> <importer implementation="org.jetbrains.idea.maven.plugins.groovy.Groovy_1_1_plus_Importer"/> <importer implementation="org.jetbrains.idea.maven.plugins.groovy.GroovyGmavenImporter"/> + <importer implementation="org.jetbrains.idea.maven.plugins.groovy.GroovyEclipseCompilerImporter"/> <pluginDescriptor mavenId="org.codehaus.groovy.maven:gmaven-plugin"> <param name="source" languageProvider="org.jetbrains.idea.maven.plugins.groovy.MavenGroovyLanguageProvider"/> diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml index 5ef7e212f02b..c1d210a8278a 100644 --- a/plugins/maven/src/main/resources/META-INF/plugin.xml +++ b/plugins/maven/src/main/resources/META-INF/plugin.xml @@ -183,6 +183,9 @@ <param name="reportFormat" values="brief, plain" soft="true"/> <param name="runOrder" values="alphabetical, reversealphabetical, random, hourly, failedfirst, balanced, filesystem" soft="true"/> <param name="testNGArtifactName" refProvider="org.jetbrains.idea.maven.plugins.api.common.MavenCommonParamReferenceProviders$DependencyWithoutVersion"/> + + <property name="surefire.threadNumber" insideConfigurationOnly="true" /> + <property name="surefire.forkNumber" insideConfigurationOnly="true" /> </pluginDescriptor> <pluginDescriptor mavenId="org.apache.maven.plugins:maven-failsafe-plugin"> diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/ResourceFilteringTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/ResourceFilteringTest.java index 1a27f94ff708..4518c4adccc9 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/ResourceFilteringTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/ResourceFilteringTest.java @@ -998,4 +998,186 @@ public abstract class ResourceFilteringTest extends MavenCompilingTestCase { assertNotNull(myProjectPom.getParent().findFileByRelativePath("target/classes/file.xyz")); } + + public void testResourcesOrdering1() throws Exception { + createProjectSubFile("resources/file.properties", "value=${project.version}\n"); + + importProject("<groupId>test</groupId>" + + "<artifactId>project</artifactId>" + + "<version>1</version>" + + "" + + + "<build>" + + " <resources>" + + " <resource>" + + " <directory>resources</directory>" + + " <filtering>false</filtering>" + + " </resource>" + + " <resource>" + + " <directory>resources</directory>" + + " <filtering>true</filtering>" + + " </resource>" + + " </resources>" + + "</build>"); + + compileModules("project"); + + assertResult("target/classes/file.properties", "value=1\n"); // Filtered file override non-filtered file + } + + public void testResourcesOrdering2() throws Exception { + if (!useJps()) return; + + createProjectSubFile("resources/file.properties", "value=${project.version}\n"); + + importProject("<groupId>test</groupId>" + + "<artifactId>project</artifactId>" + + "<version>1</version>" + + "" + + + "<build>" + + " <resources>" + + " <resource>" + + " <directory>resources</directory>" + + " <filtering>true</filtering>" + + " </resource>" + + " <resource>" + + " <directory>resources</directory>" + + " <filtering>false</filtering>" + + " </resource>" + + " </resources>" + + "</build>"); + + compileModules("project"); + + assertResult("target/classes/file.properties", "value=1\n"); // Filtered file override non-filtered file + } + + public void testResourcesOrdering3() throws Exception { + if (!useJps()) return; + + createProjectSubFile("resources1/a.txt", "1"); + createProjectSubFile("resources2/a.txt", "2"); + + importProject("<groupId>test</groupId>" + + "<artifactId>project</artifactId>" + + "<version>1</version>" + + "" + + + "<build>" + + " <resources>" + + " <resource>" + + " <directory>resources1</directory>" + + " </resource>" + + " <resource>" + + " <directory>resources2</directory>" + + " </resource>" + + " </resources>" + + "</build>"); + + compileModules("project"); + + assertResult("target/classes/a.txt", "1"); // First file was copied, second file was not override first file + } + + public void testResourcesOrdering4() throws Exception { + createProjectSubFile("resources1/a.txt", "1"); + createProjectSubFile("resources2/a.txt", "2"); + + importProject("<groupId>test</groupId>" + + "<artifactId>project</artifactId>" + + "<version>1</version>" + + "" + + + "<build>" + + " <resources>" + + " <resource>" + + " <directory>resources1</directory>" + + " <filtering>true</filtering>" + + " </resource>" + + " <resource>" + + " <directory>resources2</directory>" + + " <filtering>true</filtering>" + + " </resource>" + + " </resources>" + + "</build>"); + + compileModules("project"); + + assertResult("target/classes/a.txt", "2"); // For the filtered files last file override other files. + } + + public void testOverwriteParameter1() throws Exception { + if (!useJps()) return; + + createProjectSubFile("resources1/a.txt", "1"); + createProjectSubFile("resources2/a.txt", "2"); + + importProject("<groupId>test</groupId>" + + "<artifactId>project</artifactId>" + + "<version>1</version>" + + "" + + + "<build>" + + " <resources>" + + " <resource>" + + " <directory>resources1</directory>" + + " </resource>" + + " <resource>" + + " <directory>resources2</directory>" + + " </resource>" + + " </resources>" + + "" + + " <plugins>" + + " <plugin>" + + " <artifactId>maven-resources-plugin</artifactId>" + + " <configuration>" + + " <overwrite>true</overwrite>" + + " </configuration>" + + " </plugin>" + + " </plugins>" + + "</build>"); + + compileModules("project"); + + assertResult("target/classes/a.txt", "2"); + } + + public void testOverwriteParameter2() throws Exception { + if (!useJps()) return; + + createProjectSubFile("resources1/a.txt", "1"); + createProjectSubFile("resources2/a.txt", "2"); + + importProject("<groupId>test</groupId>" + + "<artifactId>project</artifactId>" + + "<version>1</version>" + + "" + + + "<build>" + + " <resources>" + + " <resource>" + + " <directory>resources1</directory>" + + " <filtering>true</filtering>" + + " </resource>" + + " <resource>" + + " <directory>resources2</directory>" + + " </resource>" + + " </resources>" + + "" + + " <plugins>" + + " <plugin>" + + " <artifactId>maven-resources-plugin</artifactId>" + + " <configuration>" + + " <overwrite>true</overwrite>" + + " </configuration>" + + " </plugin>" + + " </plugins>" + + "</build>"); + + compileModules("project"); + + assertResult("target/classes/a.txt", "2"); + } + } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/GroovyImporterTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/GroovyImporterTest.java index a84613293b1d..0ba45198208a 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/GroovyImporterTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/GroovyImporterTest.java @@ -131,6 +131,69 @@ public class GroovyImporterTest extends MavenImportingTestCase { assertTestResources("project", "src/test/resources"); } + public void testGroovyEclipsePlugin() throws Exception { + createStdProjectFolders(); + createProjectSubDirs("src/main/groovy", + "src/test/groovy"); + + importProject("<groupId>test</groupId>" + + "<artifactId>project</artifactId>" + + "<version>1</version>" + + "" + + "<dependencies>\n" + + " <dependency>\n" + + " <groupId>org.codehaus.groovy</groupId>\n" + + " <artifactId>groovy-all</artifactId>\n" + + " <version>2.1.0</version>\n" + + " </dependency>\n" + + "</dependencies>" + + "" + + "<build>\n" + + " <pluginManagement>\n" + + " <plugins>\n" + + " <plugin>\n" + + " <artifactId>maven-compiler-plugin</artifactId>\n" + + " <configuration>\n" + + " <compilerId>groovy-eclipse-compiler</compilerId>\n" + + " <source>1.7</source>\n" + + " <target>1.7</target>\n" + + " <showWarnings>false</showWarnings>\n" + + " </configuration>\n" + + " <dependencies>\n" + + " <dependency>\n" + + " <groupId>org.codehaus.groovy</groupId>\n" + + " <artifactId>groovy-eclipse-compiler</artifactId>\n" + + " <version>2.8.0-01</version>\n" + + " </dependency>\n" + + " <dependency>\n" + + " <groupId>org.codehaus.groovy</groupId>\n" + + " <artifactId>groovy-eclipse-batch</artifactId>\n" + + " <version>2.1.3-01</version>\n" + + " </dependency>\n" + + " </dependencies>\n" + + " </plugin>\n" + + " <plugin>\n" + + " <groupId>org.codehaus.groovy</groupId>\n" + + " <artifactId>groovy-eclipse-compiler</artifactId>\n" + + " <version>2.8.0-01</version>\n" + + " <extensions>true</extensions>\n" + + " </plugin>\n" + + " </plugins>\n" + + " </pluginManagement>\n" + + "</build>\n"); + + assertModules("project"); + + assertSources("project", + "src/main/java", + "src/main/groovy"); + assertResources("project", "src/main/resources"); + assertTestSources("project", + "src/test/java", + "src/test/groovy"); + assertTestResources("project", "src/test/resources"); + } + public void testAddingCustomGroovySpecificSources() throws Exception { createStdProjectFolders(); createProjectSubDirs("src/main/groovy", diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/plugins/surefire/MavenSurefirePluginTest.groovy b/plugins/maven/src/test/java/org/jetbrains/idea/maven/plugins/surefire/MavenSurefirePluginTest.groovy index 2d76b7028440..b57b52837249 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/plugins/surefire/MavenSurefirePluginTest.groovy +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/plugins/surefire/MavenSurefirePluginTest.groovy @@ -51,4 +51,131 @@ class MavenSurefirePluginTest extends MavenDomTestCase { assertCompletionVariants(myProjectPom, "main", "test") } + void testCompletionSurefireProperties() { + importProject(""" + <groupId>simpleMaven</groupId> + <artifactId>simpleMaven</artifactId> + <version>1.0</version> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <additionalClasspathElements> + <additionalClasspathElement>\${surefire.<caret>}</additionalClasspathElement> + </additionalClasspathElements> + </configuration> + </plugin> + </plugins> + </build> +""") + + assertCompletionVariants(myProjectPom, "surefire.forkNumber", "surefire.threadNumber") + } + + void testCompletionSurefirePropertiesOutsideConfiguration() { + importProject(""" + <groupId>simpleMaven</groupId> + <artifactId>simpleMaven</artifactId> + <version>1.0</version> + + <properties> + <aaa>\${surefire.<caret>}</aaa> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + </configuration> + </plugin> + </plugins> + </build> +""") + + assertCompletionVariants(myProjectPom) + } + + void testSurefirePropertiesHighlighting() { + importProject(""" + <groupId>simpleMaven</groupId> + <artifactId>simpleMaven</artifactId> + <version>1.0</version> + + <properties> + <aaa>\${surefire.forkNumber}</aaa> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <additionalClasspathElements> + <additionalClasspathElement>\${surefire.forkNumber}</additionalClasspathElement> + </additionalClasspathElements> + </configuration> + + <executions> + <execution> + <goals> + <goal>test</goal> + <goal>\${surefire.threadNumber}</goal> + </goals> + <configuration> + <debugForkedProcess>\${surefire.threadNumber}</debugForkedProcess> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +""") + + createProjectPom(""" + <groupId>simpleMaven</groupId> + <artifactId>simpleMaven</artifactId> + <version>1.0</version> + + <properties> + <aaa>\${<error>surefire.forkNumber</error>}</aaa> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <additionalClasspathElements> + <additionalClasspathElement>\${surefire.forkNumber}</additionalClasspathElement> + </additionalClasspathElements> + </configuration> + + <executions> + <execution> + <goals> + <goal>test</goal> + <goal>\${<error>surefire.threadNumber</error>}</goal> + </goals> + <configuration> + <debugForkedProcess>\${surefire.threadNumber}</debugForkedProcess> + </configuration> + </execution> + </executions> + + </plugin> + </plugins> + </build> +""") + + checkHighlighting() + } + + } diff --git a/plugins/svn4idea/lib/GANYMED-LICENSE b/plugins/svn4idea/lib/GANYMED-LICENSE deleted file mode 100644 index a6fdd4c8f0ce..000000000000 --- a/plugins/svn4idea/lib/GANYMED-LICENSE +++ /dev/null @@ -1,57 +0,0 @@ -Copyright (c) 2005 - 2006 Swiss Federal Institute of Technology (ETH Zurich), - Department of Computer Science (http://www.inf.ethz.ch), - Christian Plattner. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -a.) Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -b.) Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -c.) Neither the name of ETH Zurich nor the names of its contributors may - be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - - -The Java implementations of the AES, Blowfish and 3DES ciphers have been -taken (and slightly modified) from the cryptography package released by -"The Legion Of The Bouncy Castle". - -Their license states the following: - -Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle -(http://www.bouncycastle.org) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - diff --git a/plugins/svn4idea/lib/antlr.jar b/plugins/svn4idea/lib/antlr.jar Binary files differindex b0a9ea69f5c2..865a537b0c5e 100644 --- a/plugins/svn4idea/lib/antlr.jar +++ b/plugins/svn4idea/lib/antlr.jar diff --git a/plugins/svn4idea/lib/jsch.agentproxy.svnkit-trilead-ssh2.jar b/plugins/svn4idea/lib/jsch.agentproxy.svnkit-trilead-ssh2.jar Binary files differnew file mode 100644 index 000000000000..e95598411ce3 --- /dev/null +++ b/plugins/svn4idea/lib/jsch.agentproxy.svnkit-trilead-ssh2.jar diff --git a/plugins/svn4idea/lib/sqljet.jar b/plugins/svn4idea/lib/sqljet.jar Binary files differindex d6e0232c1001..d04dd0f9f606 100644 --- a/plugins/svn4idea/lib/sqljet.jar +++ b/plugins/svn4idea/lib/sqljet.jar diff --git a/plugins/svn4idea/lib/sqljetsrc.zip b/plugins/svn4idea/lib/sqljetsrc.zip Binary files differindex 3fa277975ab0..3e39e241fe5b 100644 --- a/plugins/svn4idea/lib/sqljetsrc.zip +++ b/plugins/svn4idea/lib/sqljetsrc.zip diff --git a/plugins/svn4idea/lib/svnkit-javahl.jar b/plugins/svn4idea/lib/svnkit-javahl.jar Binary files differindex 5dc349cf60a9..f0443df93049 100644 --- a/plugins/svn4idea/lib/svnkit-javahl.jar +++ b/plugins/svn4idea/lib/svnkit-javahl.jar diff --git a/plugins/svn4idea/lib/svnkit-javahl16.zip b/plugins/svn4idea/lib/svnkit-javahl16.zip Binary files differindex 563f5930e74d..56ac8c12f144 100644 --- a/plugins/svn4idea/lib/svnkit-javahl16.zip +++ b/plugins/svn4idea/lib/svnkit-javahl16.zip diff --git a/plugins/svn4idea/lib/svnkit.jar b/plugins/svn4idea/lib/svnkit.jar Binary files differindex c01f43040416..d6a45918aa63 100644 --- a/plugins/svn4idea/lib/svnkit.jar +++ b/plugins/svn4idea/lib/svnkit.jar diff --git a/plugins/svn4idea/lib/svnkitsrc.zip b/plugins/svn4idea/lib/svnkitsrc.zip Binary files differindex 81c259467896..8cd4815aa2d7 100644 --- a/plugins/svn4idea/lib/svnkitsrc.zip +++ b/plugins/svn4idea/lib/svnkitsrc.zip diff --git a/plugins/svn4idea/lib/trilead.jar b/plugins/svn4idea/lib/trilead.jar Binary files differindex 7fca04a83626..43d882bd05a0 100644 --- a/plugins/svn4idea/lib/trilead.jar +++ b/plugins/svn4idea/lib/trilead.jar diff --git a/plugins/svn4idea/lib/trileadsrc.zip b/plugins/svn4idea/lib/trileadsrc.zip Binary files differnew file mode 100644 index 000000000000..bf8b916710c3 --- /dev/null +++ b/plugins/svn4idea/lib/trileadsrc.zip diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/Svn17Detector.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/Svn17Detector.java deleted file mode 100644 index a26eb338c3b4..000000000000 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/Svn17Detector.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2000-2012 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 org.jetbrains.idea.svn; - -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.LocalFileSystem; -import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.io.File; - -/** - * Created by IntelliJ IDEA. - * User: Irina.Chernushina - * Date: 1/12/12 - * Time: 3:25 PM - */ -public class Svn17Detector { - public static final LocalFileSystem ourLfs = LocalFileSystem.getInstance(); - - public static boolean is17(@Nullable final Project project, @NotNull final File file) { - if (project != null) { - final VirtualFile vf = ourLfs.findFileByIoFile(file); - if (vf != null) { - final WorkingCopy root = SvnVcs.getInstance(project).getRootsToWorkingCopies().getWcRoot(vf); - if (root != null) { - return root.is17Copy(); // what abt not detected inner WC ??? - } - } - } - - final File rootIf17 = SvnUtil.getWcCopyRootIf17(file, null); - return rootIf17 != null; - } - - public static boolean is17(@Nullable final Project project, final VirtualFile file) { - if (project != null) { - final WorkingCopy root = SvnVcs.getInstance(project).getRootsToWorkingCopies().getWcRoot(file); - if (root != null) { - return root.is17Copy(); // what abt not detected inner WC ??? - } - } - - final File rootIf17 = SvnUtil.getWcCopyRootIf17(new File(file.getPath()), null); - return rootIf17 != null; - } -} diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationManager.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationManager.java index 0597ea1ac91a..cc94b50963d4 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationManager.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationManager.java @@ -37,6 +37,7 @@ import com.intellij.util.messages.Topic; import com.intellij.util.net.HttpConfigurable; import com.intellij.util.proxy.CommonProxy; import com.intellij.util.ui.UIUtil; +import com.trilead.ssh2.auth.AgentProxy; import org.intellij.lang.annotations.MagicConstant; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.auth.ProviderType; @@ -487,7 +488,7 @@ public class SvnAuthenticationManager extends DefaultSVNAuthenticationManager im } @Override - public void acknowledgeConnectionSuccessful(SVNURL url) { + public void acknowledgeConnectionSuccessful(SVNURL url, String method) { CommonProxy.getInstance().removeNoProxy(url.getProtocol(), url.getHost(), url.getPort()); SSLExceptionsHelper.removeInfo(); ourThreadLocalProvider.remove(); @@ -509,6 +510,8 @@ public class SvnAuthenticationManager extends DefaultSVNAuthenticationManager im SVNErrorMessage errorMessage, SVNAuthentication authentication, SVNURL url) throws SVNException { + showSshAgentErrorIfAny(errorMessage, authentication); + SSLExceptionsHelper.removeInfo(); ourThreadLocalProvider.remove(); if (url != null) { @@ -530,6 +533,22 @@ public class SvnAuthenticationManager extends DefaultSVNAuthenticationManager im } } + /** + * "Pageant is not running" error thrown in PageantConnector.query() method is caught and "eaten" in SVNKit logic. + * So for both cases "Pageant is not running" and "There are no valid keys in agent (both no keys at all and no valid keys for host)" + * we will get same "Credentials rejected by SSH server" error. + */ + private void showSshAgentErrorIfAny(@Nullable SVNErrorMessage errorMessage, @Nullable SVNAuthentication authentication) { + if (errorMessage != null && authentication instanceof SVNSSHAuthentication) { + AgentProxy agentProxy = ((SVNSSHAuthentication)authentication).getAgentProxy(); + + if (agentProxy != null) { + // TODO: Most likely this should be updated with new VcsNotifier api. + VcsBalloonProblemNotifier.showOverChangesView(myProject, errorMessage.getFullMessage(), MessageType.ERROR); + } + } + } + public void acknowledgeForSSL(boolean accepted, String kind, String realm, SVNErrorMessage message, SVNAuthentication proxy) { if (accepted && proxy instanceof SVNSSLAuthentication && (((SVNSSLAuthentication) proxy).getCertificateFile() != null)) { final SVNSSLAuthentication svnsslAuthentication = (SVNSSLAuthentication)proxy; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties index f9da72589390..38418b16ef53 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties @@ -72,6 +72,7 @@ label.ssh.authentication.realm=Authentication realm: ''{0}'' dialog.title.openssh.v2.private.key=OpenSSH v2 Private Key dialog.description.openssh.v2.private.key=Select private key file for SSH authentication checkbox.ssh.keep.for.current.session=&Save Credentials +radio.ssh.authentication.with.agent=SS&H Agent label.ssh.user.name=&User name: radio.ssh.authentication.with.password=Authentication &with password label.ssh.password=&Password: @@ -458,6 +459,8 @@ compare.with.branch.list.error=Error Loading Branches create.branch.invalid.revision.error=Invalid revision ''{0}'' create.branch.no.working.copy.error=No working copy found at {0} create.branch.no.base.location.error=No branch base location selected +create.branch.switch.on.create.title=Switch after create +action.name.switch=Switch import.dialog.title=Import into Subversion import.dialog.button=Import repository.browser.add.location.action=Add Repository Location diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurationState.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurationState.java index 22c3a8abf311..8d155399c101 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurationState.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurationState.java @@ -40,7 +40,7 @@ public class SvnConfigurationState { public int maxAnnotateRevisions = SvnConfiguration.ourMaxAnnotateRevisionsDefault; @Attribute("myUseAcceleration") - public SvnConfiguration.UseAcceleration accelerationType = SvnConfiguration.UseAcceleration.nothing; + public SvnConfiguration.UseAcceleration accelerationType = SvnConfiguration.UseAcceleration.commandLine; @Attribute("myAutoUpdateAfterCommit") public boolean autoUpdateAfterCommit; @@ -53,9 +53,7 @@ public class SvnConfigurationState { @Attribute("SSL_PROTOCOLS") public SvnConfiguration.SSLProtocols sslProtocols = - SystemInfo.JAVA_RUNTIME_VERSION.startsWith("1.7") || SystemInfo.JAVA_RUNTIME_VERSION.startsWith("1.8") - ? SvnConfiguration.SSLProtocols.all - : SvnConfiguration.SSLProtocols.sslv3; + SystemInfo.isJavaVersionAtLeast("1.7") ? SvnConfiguration.SSLProtocols.all : SvnConfiguration.SSLProtocols.sslv3; @OptionTag("mySSHConnectionTimeout") public long sshConnectionTimeout = 30 * 1000; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileSystemListener.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileSystemListener.java index 5727458ad9d9..2e2145b8853a 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileSystemListener.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileSystemListener.java @@ -211,8 +211,6 @@ public class SvnFileSystemListener extends CommandAdapter implements LocalFileOp } public boolean move(VirtualFile file, VirtualFile toDir) throws IOException { - FileDocumentManager.getInstance().saveAllDocuments(); - File srcFile = getIOFile(file); File dstFile = new File(getIOFile(toDir), file.getName()); @@ -223,6 +221,8 @@ public class SvnFileSystemListener extends CommandAdapter implements LocalFileOp if (vcs == null) { return false; } + + FileDocumentManager.getInstance().saveAllDocuments(); if (sourceVcs == null) { return createItem(toDir, file.getName(), file.isDirectory(), true); } @@ -241,12 +241,12 @@ public class SvnFileSystemListener extends CommandAdapter implements LocalFileOp } public boolean rename(VirtualFile file, String newName) throws IOException { - FileDocumentManager.getInstance().saveAllDocuments(); - File srcFile = getIOFile(file); File dstFile = new File(srcFile.getParentFile(), newName); SvnVcs vcs = getVCS(file); if (vcs != null) { + FileDocumentManager.getInstance().saveAllDocuments(); + myFilesToRefresh.add(file.getParent()); return doMove(vcs, srcFile, dstFile); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java index 3b8bb4ac57cf..b8a5c14b5d97 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java @@ -27,6 +27,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtilRt; +import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.AbstractVcsHelper; import com.intellij.openapi.vcs.VcsException; @@ -539,6 +540,12 @@ public class SvnUtil { } public static boolean checkRepositoryVersion15(final SvnVcs vcs, final String url) { + // Merge info tracking is supported in repositories since svn 1.5 (June 2008) - see http://subversion.apache.org/docs/release-notes/. + // So by default we assume repository supports merge info tracking. + if (!Registry.is("svn.check.repository.supports.merge.info")) { + return true; + } + SVNRepository repository = null; try { repository = vcs.createRepository(url); @@ -613,21 +620,6 @@ public class SvnUtil { return info == null ? null : info.getURL(); } - public static boolean doesRepositorySupportMergeInfo(final SvnVcs vcs, final SVNURL url) { - SVNRepository repository = null; - try { - repository = vcs.createRepository(url); - return repository.hasCapability(SVNCapability.MERGE_INFO); - } - catch (SVNException e) { - return false; - } finally { - if (repository != null) { - repository.closeSession(); - } - } - } - public static boolean remoteFolderIsEmpty(final SvnVcs vcs, final String url) throws SVNException { // TODO: Implement with command line client SVNRepository repository = null; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/CreateBranchOrTagAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/CreateBranchOrTagAction.java index d263f1e325b6..43b0a479d089 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/CreateBranchOrTagAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/CreateBranchOrTagAction.java @@ -30,6 +30,7 @@ import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.StatusBar; import com.intellij.openapi.wm.WindowManager; +import com.intellij.vcsUtil.VcsUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.SvnStatusUtil; @@ -37,6 +38,8 @@ import org.jetbrains.idea.svn.SvnVcs; import org.jetbrains.idea.svn.checkin.IdeaCommitHandler; import org.jetbrains.idea.svn.commandLine.CommitEventHandler; import org.jetbrains.idea.svn.dialogs.CreateBranchOrTagDialog; +import org.jetbrains.idea.svn.update.AutoSvnUpdater; +import org.jetbrains.idea.svn.update.SingleRootSwitcher; import org.tmatesoft.svn.core.SVNErrorCode; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNURL; @@ -125,6 +128,13 @@ public class CreateBranchOrTagAction extends BasicAction { if (!exception.isNull()) { throw new VcsException(exception.get()); } + + if (dialog.isCopyFromWorkingCopy() && dialog.isSwitchOnCreate()) { + SingleRootSwitcher switcher = + new SingleRootSwitcher(project, VcsUtil.getFilePath(srcFile, srcFile.isDirectory()), dstSvnUrl.toDecodedString()); + + AutoSvnUpdater.run(switcher, SvnBundle.message("action.name.switch")); + } } } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java index d35752a9c41a..b53492013ef1 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java @@ -16,6 +16,7 @@ package org.jetbrains.idea.svn.checkin; import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.util.Computable; @@ -45,6 +46,8 @@ import java.util.List; */ public class IdeaCommitHandler implements CommitEventHandler, ISVNEventHandler { + private static final Logger LOG = Logger.getInstance(IdeaCommitHandler.class); + @Nullable private final ProgressIndicator myProgress; @NotNull private final List<VirtualFile> myDeletedFiles = ContainerUtil.newArrayList(); private final boolean myCheckCancel; @@ -135,7 +138,7 @@ public class IdeaCommitHandler implements CommitEventHandler, ISVNEventHandler { @NotNull private static CommitEventType convert(@NotNull SVNEventAction action) { - CommitEventType result = null; + CommitEventType result = CommitEventType.unknown; if (SVNEventAction.COMMIT_ADDED.equals(action)) { result = CommitEventType.adding; @@ -149,10 +152,12 @@ public class IdeaCommitHandler implements CommitEventHandler, ISVNEventHandler { result = CommitEventType.transmittingDeltas; } else if (SVNEventAction.SKIP.equals(action)) { result = CommitEventType.skipped; + } else if (SVNEventAction.FAILED_OUT_OF_DATE.equals(action)) { + result = CommitEventType.failedOutOfDate; } - if (result == null) { - throw new IllegalArgumentException("Unknown action " + action); + if (CommitEventType.unknown.equals(result)) { + LOG.warn("Could not create commit event from action " + action); } return result; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/SvnCheckinHandlerFactory.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/SvnCheckinHandlerFactory.java index 860f72f37ab8..8af993b9aefc 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/SvnCheckinHandlerFactory.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/SvnCheckinHandlerFactory.java @@ -15,10 +15,6 @@ */ package org.jetbrains.idea.svn.checkin; -import com.intellij.ide.DataManager; -import com.intellij.openapi.actionSystem.ActionManager; -import com.intellij.openapi.actionSystem.ActionPlaces; -import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.project.Project; @@ -38,14 +34,12 @@ import com.intellij.openapi.vcs.ui.RefreshableOnComponent; import com.intellij.openapi.vcs.update.ActionInfo; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.openapi.wm.WindowManager; import com.intellij.util.PairConsumer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.*; import org.jetbrains.idea.svn.update.AutoSvnUpdater; -import javax.swing.*; import java.io.File; import java.util.ArrayList; import java.util.Collection; @@ -126,12 +120,7 @@ public class SvnCheckinHandlerFactory extends VcsCheckinHandlerFactory { ApplicationManager.getApplication().invokeLater(new Runnable() { @Override public void run() { - final JComponent frame = WindowManager.getInstance().getIdeFrame(project).getComponent(); - final AutoSvnUpdater updater = new AutoSvnUpdater(project, paths.toArray(new FilePath[paths.size()])); - updater.getTemplatePresentation().setText(ActionInfo.UPDATE.getActionName()); - updater.actionPerformed( - new AnActionEvent(null, DataManager.getInstance().getDataContext(frame), ActionPlaces.UNKNOWN, - updater.getTemplatePresentation(), ActionManager.getInstance(), 0)); + AutoSvnUpdater.run(new AutoSvnUpdater(project, paths.toArray(new FilePath[paths.size()])), ActionInfo.UPDATE.getActionName()); } }, ModalityState.NON_MODAL); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandExecutor.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandExecutor.java index a7580aedd4f8..ee97159b9eec 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandExecutor.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandExecutor.java @@ -16,6 +16,7 @@ package org.jetbrains.idea.svn.commandLine; import com.intellij.execution.ExecutionException; +import com.intellij.execution.configurations.EncodingEnvironmentUtil; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.execution.process.*; import com.intellij.openapi.diagnostic.Logger; @@ -105,6 +106,8 @@ public class CommandExecutor { checkNotStarted(); try { + EncodingEnvironmentUtil.fixDefaultEncodingIfMac(myCommandLine, null); + myProcess = createProcess(); if (LOG.isDebugEnabled()) { LOG.debug(myCommandLine.toString()); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommitEventType.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommitEventType.java index f0c6df7c61ec..f64bf745fa08 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommitEventType.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommitEventType.java @@ -22,13 +22,15 @@ package org.jetbrains.idea.svn.commandLine; * Time: 6:51 PM */ public enum CommitEventType { + unknown("Unknown"), adding("Adding"), deleting("Deleting"), sending("Sending"), replacing("Replacing"), transmittingDeltas("Transmitting file data"), committedRevision("Committed revision"), - skipped("Skipped"); + skipped("Skipped"), + failedOutOfDate("Failed out of date"); private final String myText; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CreateBranchOrTagDialog.form b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CreateBranchOrTagDialog.form index 1b8924b12e77..6dfcae6c9f6f 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CreateBranchOrTagDialog.form +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CreateBranchOrTagDialog.form @@ -2,7 +2,7 @@ <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.idea.svn.dialogs.CreateBranchOrTagDialog"> <grid id="9287c" binding="myTopPanel" layout-manager="GridBagLayout"> <constraints> - <xy x="10" y="10" width="561" height="470"/> + <xy x="10" y="10" width="561" height="502"/> </constraints> <properties/> <border type="none"/> @@ -26,7 +26,7 @@ </component> </children> </scrollpane> - <grid id="9317" layout-manager="GridLayoutManager" row-count="6" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> + <grid id="9317" layout-manager="GridLayoutManager" row-count="7" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <margin top="0" left="0" bottom="0" right="0"/> <constraints> <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> @@ -55,7 +55,7 @@ </component> <component id="27881" class="javax.swing.JRadioButton" binding="myRepositoryRadioButton" default-binding="true"> <constraints> - <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> + <grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> </constraints> <properties> <text value="&Repository Location:"/> @@ -63,13 +63,13 @@ </component> <component id="d7ae0" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myRepositoryField"> <constraints> - <grid row="4" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="6" anchor="0" fill="3" indent="2" use-parent-layout="false"/> + <grid row="5" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="6" anchor="0" fill="3" indent="2" use-parent-layout="false"/> </constraints> <properties/> </component> <component id="675da" class="javax.swing.JLabel"> <constraints> - <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/> + <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/> </constraints> <properties> <text value="Re&vision:"/> @@ -77,17 +77,17 @@ </component> <nested-form id="23004" form-file="org/jetbrains/idea/svn/update/SvnRevisionPanel.form" binding="myRevisionPanel"> <constraints> - <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/> + <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/> </constraints> </nested-form> <hspacer id="b36ab"> <constraints> - <grid row="5" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/> + <grid row="6" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/> </constraints> </hspacer> <component id="13071" class="javax.swing.JButton" binding="myProjectButton"> <constraints> - <grid row="4" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/> + <grid row="5" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/> </constraints> <properties> <margin top="2" left="2" bottom="2" right="2"/> @@ -103,6 +103,15 @@ <text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="dialog.create.branch.or.tag.from.working.copy.warning"/> </properties> </component> + <component id="ff73f" class="com.intellij.ui.components.JBCheckBox" binding="mySwitchOnCreate"> + <constraints> + <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/> + </constraints> + <properties> + <margin top="0" left="-1" bottom="2" right="3"/> + <text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="create.branch.switch.on.create.title"/> + </properties> + </component> </children> </grid> <grid id="a6551" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CreateBranchOrTagDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CreateBranchOrTagDialog.java index 05ed4b0689bb..9c5d19420399 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CreateBranchOrTagDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CreateBranchOrTagDialog.java @@ -27,6 +27,7 @@ import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.ComboboxWithBrowseButton; import com.intellij.ui.DocumentAdapter; +import com.intellij.ui.components.JBCheckBox; import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; @@ -81,6 +82,7 @@ public class CreateBranchOrTagDialog extends DialogWrapper { private JButton myProjectButton; private JLabel myErrorLabel; private JLabel myUseThisVariantToLabel; + private JBCheckBox mySwitchOnCreate; @NonNls private static final String HELP_ID = "vcs.subversion.branch"; private SvnBranchConfigurationNew myBranchConfiguration; @@ -236,6 +238,7 @@ public class CreateBranchOrTagDialog extends DialogWrapper { private void updateControls() { myWorkingCopyField.setEnabled(myWorkingCopyRadioButton.isSelected()); + mySwitchOnCreate.setEnabled(myWorkingCopyRadioButton.isSelected()); myRepositoryField.setEnabled(myRepositoryRadioButton.isSelected()); myRevisionPanel.setEnabled(myRepositoryRadioButton.isSelected()); myProjectButton.setEnabled(myRepositoryRadioButton.isSelected()); @@ -369,4 +372,8 @@ public class CreateBranchOrTagDialog extends DialogWrapper { public String getCopyFromUrl() { return myRepositoryField.getText(); } + + public boolean isSwitchOnCreate() { + return mySwitchOnCreate.isSelected(); + } } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java index 2bf09e0b6dba..230a057f6800 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java @@ -154,20 +154,14 @@ public class QuickMerge { @Override public void run(ContinuationContext context) { - try { - final List<TaskDescriptor> tasks = new LinkedList<TaskDescriptor>(); - final boolean supportsMergeinfo = myWcInfo.getFormat().supportsMergeInfo() && - SvnUtil.doesRepositorySupportMergeInfo(myVcs, SVNURL.parseURIEncoded(mySourceUrl)); - if (! supportsMergeinfo) { - insertMergeAll(tasks); - } else { - tasks.add(new MergeAllOrSelectedChooser()); - } - context.next(tasks); - } - catch (SVNException e) { - finishWithError(context, e.getMessage(), true); + final List<TaskDescriptor> tasks = new LinkedList<TaskDescriptor>(); + final boolean supportsMergeinfo = myWcInfo.getFormat().supportsMergeInfo() && SvnUtil.checkRepositoryVersion15(myVcs, mySourceUrl); + if (! supportsMergeinfo) { + insertMergeAll(tasks); + } else { + tasks.add(new MergeAllOrSelectedChooser()); } + context.next(tasks); } } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SSHCredentialsDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SSHCredentialsDialog.java index 5f5e37b2e13d..bf77ced4b1bb 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SSHCredentialsDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SSHCredentialsDialog.java @@ -27,6 +27,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; +import com.intellij.ui.components.JBRadioButton; import com.intellij.util.Consumer; import com.intellij.util.SystemProperties; import com.intellij.util.ui.UIUtil; @@ -53,6 +54,7 @@ import java.util.List; */ public class SSHCredentialsDialog extends DialogWrapper implements ActionListener, DocumentListener { private boolean myAllowSave; + private boolean myIsAgentAllowed; private String myUserName; private String myRealm; @@ -61,6 +63,7 @@ public class SSHCredentialsDialog extends DialogWrapper implements ActionListene private JPasswordField myPasswordText; private JPasswordField myPassphraseText; private TextFieldWithBrowseButton myKeyFileText; + private JBRadioButton mySshAgentButton; private JRadioButton myPasswordButton; private JRadioButton myKeyButton; private JLabel myPasswordLabel; @@ -73,12 +76,18 @@ public class SSHCredentialsDialog extends DialogWrapper implements ActionListene @NonNls private static final String HELP_ID = "vcs.subversion.authentication"; private boolean myKeyFileEmptyOrCorrect; - protected SSHCredentialsDialog(Project project, String realm, String userName, boolean allowSave, final int port) { + protected SSHCredentialsDialog(Project project, + String realm, + String userName, + boolean allowSave, + final int port, + boolean isAgentAllowed) { super(project, true); myProject = project; myRealm = realm; myUserName = userName; myAllowSave = allowSave; + myIsAgentAllowed = isAgentAllowed; setResizable(true); getHelpAction().setEnabled(true); init(); @@ -145,6 +154,16 @@ public class SSHCredentialsDialog extends DialogWrapper implements ActionListene gb.gridx = 0; gb.fill = GridBagConstraints.NONE; gb.gridwidth = 3; + + // ssh agent type + mySshAgentButton = new JBRadioButton(SvnBundle.message("radio.ssh.authentication.with.agent")); + panel.add(mySshAgentButton, gb); + gb.gridy += 1; + gb.weightx = 0; + gb.gridx = 0; + gb.fill = GridBagConstraints.NONE; + gb.gridwidth = 3; + // password type myPasswordButton = new JRadioButton(SvnBundle.message("radio.ssh.authentication.with.password")); panel.add(myPasswordButton, gb); @@ -254,10 +273,12 @@ public class SSHCredentialsDialog extends DialogWrapper implements ActionListene myPortField.getDocument().addDocumentListener(this); ButtonGroup group = new ButtonGroup(); + group.add(mySshAgentButton); group.add(myPasswordButton); group.add(myKeyButton); - group.setSelected(myPasswordButton.getModel(), true); - group.setSelected(myPasswordButton.getModel(), false); + + mySshAgentButton.setEnabled(myIsAgentAllowed); + group.setSelected((myIsAgentAllowed ? mySshAgentButton : myPasswordButton).getModel(), true); gb.gridy += 1; gb.gridx = 0; @@ -283,6 +304,7 @@ public class SSHCredentialsDialog extends DialogWrapper implements ActionListene myAllowSaveCheckBox.setSelected(false); myAllowSaveCheckBox.setEnabled(myAllowSave); + mySshAgentButton.addActionListener(this); myKeyButton.addActionListener(this); myPasswordButton.addActionListener(this); @@ -314,6 +336,9 @@ public class SSHCredentialsDialog extends DialogWrapper implements ActionListene if (! myKeyFileEmptyOrCorrect) return false; ok = myKeyFileText != null && myKeyFileText.getText().trim().length() > 0; } + else { + ok = mySshAgentButton.isSelected(); + } if (ok) { String portNumber = myPortField.getText(); try { @@ -327,6 +352,10 @@ public class SSHCredentialsDialog extends DialogWrapper implements ActionListene return ok; } + public boolean isSshAgentSelected() { + return mySshAgentButton.isSelected(); + } + public String getUserName() { return isOK() && myUserNameText != null ? myUserNameText.getText() : null; } @@ -383,7 +412,7 @@ public class SSHCredentialsDialog extends DialogWrapper implements ActionListene } public void actionPerformed(ActionEvent e) { - if (e.getSource() == myPasswordButton || e.getSource() == myKeyButton) { + if (e.getSource() == myPasswordButton || e.getSource() == myKeyButton || e.getSource() == mySshAgentButton) { updateFields(); checkKeyFile(); updateOKButton(); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnInteractiveAuthenticationProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnInteractiveAuthenticationProvider.java index 5be10cf05fbb..b39dddedc632 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnInteractiveAuthenticationProvider.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnInteractiveAuthenticationProvider.java @@ -25,6 +25,10 @@ import com.intellij.openapi.ui.MessageType; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier; import com.intellij.util.WaitForProgressToShow; +import com.jcraft.jsch.agentproxy.AgentProxyException; +import com.jcraft.jsch.agentproxy.Connector; +import com.jcraft.jsch.agentproxy.ConnectorFactory; +import com.jcraft.jsch.agentproxy.TrileadAgentProxy; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.SvnAuthenticationManager; @@ -114,21 +118,32 @@ public class SvnInteractiveAuthenticationProvider implements ISVNAuthenticationP }; } else if (ISVNAuthenticationManager.SSH.equals(kind)) { + // In current implementation, pageant connector available = operating system is Windows. + // So "ssh agent" option will be always available on Windows, even if pageant is not running. + final Connector agentConnector = createSshAgentConnector(); + final boolean isAgentAvailable = agentConnector != null && agentConnector.isAvailable(); + command = new Runnable() { public void run() { - SSHCredentialsDialog dialog = new SSHCredentialsDialog(myProject, realm, userName, authCredsOn, url.getPort()); + SSHCredentialsDialog dialog = new SSHCredentialsDialog(myProject, realm, userName, authCredsOn, url.getPort(), isAgentAvailable); setTitle(dialog, errorMessage); dialog.show(); if (dialog.isOK()) { int port = dialog.getPortNumber(); - if (dialog.getKeyFile() != null && dialog.getKeyFile().trim().length() > 0) { + if (dialog.isSshAgentSelected()) { + if (agentConnector != null) { + result[0] = + new SVNSSHAuthentication(dialog.getUserName(), new TrileadAgentProxy(agentConnector), port, url, false); + } + } + else if (dialog.getKeyFile() != null && dialog.getKeyFile().trim().length() > 0) { String passphrase = dialog.getPassphrase(); if (passphrase != null && passphrase.length() == 0) { passphrase = null; } result[0] = - new SVNSSHAuthentication(dialog.getUserName(), new File(dialog.getKeyFile()), passphrase, port, dialog.isSaveAllowed(), - url, false); + new SVNSSHAuthentication(dialog.getUserName(), new File(dialog.getKeyFile()), passphrase, port, dialog.isSaveAllowed(), url, + false); } else { result[0] = new SVNSSHAuthentication(dialog.getUserName(), dialog.getPassword(), port, dialog.isSaveAllowed(), url, false); @@ -166,6 +181,20 @@ public class SvnInteractiveAuthenticationProvider implements ISVNAuthenticationP return result[0]; } + @Nullable + private static Connector createSshAgentConnector() { + Connector result = null; + + try { + result = ConnectorFactory.getDefault().createConnector(); + } + catch (AgentProxyException e) { + LOG.info("Could not create ssh agent connector", e); + } + + return result; + } + private static void setTitle(@NotNull DialogWrapper dialog, @Nullable SVNErrorMessage errorMessage) { dialog.setTitle(errorMessage == null ? SvnBundle.message("dialog.title.authentication.required") diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AutoSvnUpdater.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AutoSvnUpdater.java index cf424af4ef78..925d13c7242f 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AutoSvnUpdater.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AutoSvnUpdater.java @@ -15,17 +15,24 @@ */ package org.jetbrains.idea.svn.update; +import com.intellij.ide.DataManager; +import com.intellij.openapi.actionSystem.ActionManager; +import com.intellij.openapi.actionSystem.ActionPlaces; +import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vcs.actions.VcsContext; import com.intellij.openapi.vcs.update.*; +import com.intellij.openapi.wm.WindowManager; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.SvnConfiguration; import org.jetbrains.idea.svn.SvnVcs; import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.wc.SVNRevision; +import javax.swing.*; import java.util.LinkedHashMap; /** @@ -44,6 +51,16 @@ public class AutoSvnUpdater extends AbstractCommonUpdateAction { myRoots = roots; } + public static void run(@NotNull AutoSvnUpdater updater, @NotNull String title) { + JComponent frame = WindowManager.getInstance().getIdeFrame(updater.myProject).getComponent(); + + updater.getTemplatePresentation().setText(title); + updater.actionPerformed( + new AnActionEvent(null, DataManager.getInstance().getDataContext(frame), ActionPlaces.UNKNOWN, updater.getTemplatePresentation(), + ActionManager.getInstance(), 0) + ); + } + @Override protected void actionPerformed(VcsContext context) { final SvnConfiguration configuration17 = SvnConfiguration.getInstance(myProject); @@ -52,13 +69,16 @@ public class AutoSvnUpdater extends AbstractCommonUpdateAction { configuration17.setUpdateDepth(SVNDepth.INFINITY); final SvnVcs vcs = SvnVcs.getInstance(myProject); for (FilePath root : myRoots) { - final UpdateRootInfo info = configuration17.getUpdateRootInfo(root.getIOFile(), vcs); - info.setRevision(SVNRevision.HEAD); - info.setUpdateToRevision(false); + configureUpdateRootInfo(root, configuration17.getUpdateRootInfo(root.getIOFile(), vcs)); } super.actionPerformed(context); } + protected void configureUpdateRootInfo(@NotNull FilePath root, @NotNull UpdateRootInfo info) { + info.setRevision(SVNRevision.HEAD); + info.setUpdateToRevision(false); + } + @Override protected boolean filterRootsBeforeAction() { return false; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SingleRootSwitcher.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SingleRootSwitcher.java new file mode 100644 index 000000000000..2a8423caae1d --- /dev/null +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SingleRootSwitcher.java @@ -0,0 +1,41 @@ +/* + * Copyright 2000-2014 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 org.jetbrains.idea.svn.update; + +import com.intellij.openapi.project.Project; +import com.intellij.openapi.vcs.FilePath; +import org.jetbrains.annotations.NotNull; + +/** + * @author Konstantin Kolosovsky. + */ +public class SingleRootSwitcher extends AutoSvnUpdater { + + @NotNull private String myUrl; + + public SingleRootSwitcher(Project project, @NotNull FilePath root, @NotNull String url) { + super(project, new FilePath[]{root}); + + myUrl = url; + } + + @Override + protected void configureUpdateRootInfo(@NotNull FilePath root, @NotNull UpdateRootInfo info) { + super.configureUpdateRootInfo(root, info); + + info.setUrl(myUrl); + } +} diff --git a/plugins/svn4idea/svn4idea-tests.iml b/plugins/svn4idea/svn4idea-tests.iml index 0b826ed87489..ce4ceef956aa 100644 --- a/plugins/svn4idea/svn4idea-tests.iml +++ b/plugins/svn4idea/svn4idea-tests.iml @@ -38,6 +38,18 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="library" name="jsch-agent-proxy" level="project" /> + <orderEntry type="module-library"> + <library name="trilead-ssh2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/trilead.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/lib/trileadsrc.zip!/trilead-ssh2/src/main/java" /> + </SOURCES> + </library> + </orderEntry> </component> </module> diff --git a/plugins/svn4idea/svn4idea.iml b/plugins/svn4idea/svn4idea.iml index 1765d1aede98..20482fa75610 100644 --- a/plugins/svn4idea/svn4idea.iml +++ b/plugins/svn4idea/svn4idea.iml @@ -32,7 +32,9 @@ <root url="jar://$MODULE_DIR$/lib/trilead.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/lib/trileadsrc.zip!/trilead-ssh2/src/main/java" /> + </SOURCES> </library> </orderEntry> <orderEntry type="module" module-name="platform-impl" /> @@ -79,6 +81,16 @@ <orderEntry type="library" name="jna" level="project" /> <orderEntry type="library" name="pty4j" level="project" /> <orderEntry type="library" name="purejavacomm" level="project" /> + <orderEntry type="library" name="jsch-agent-proxy" level="project" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/jsch.agentproxy.svnkit-trilead-ssh2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> </component> </module> diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/AbstractNamedRemoteEntity.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/AbstractNamedRemoteEntity.java deleted file mode 100644 index 6733a6611ce4..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/AbstractNamedRemoteEntity.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright 2000-2012 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. - */ - -/** - * AbstractNamedRemoteEntity.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public abstract class AbstractNamedRemoteEntity extends AbstractRemoteEntity - implements java.io.Serializable { - private String name; - - public AbstractNamedRemoteEntity() { - } - - public AbstractNamedRemoteEntity( - String id, - String name) { - super( - id); - this.name = name; - } - - - /** - * Gets the name value for this AbstractNamedRemoteEntity. - * - * @return name - */ - public String getName() { - return name; - } - - - /** - * Sets the name value for this AbstractNamedRemoteEntity. - * - * @param name - */ - public void setName(String name) { - this.name = name; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof AbstractNamedRemoteEntity)) { - return false; - } - AbstractNamedRemoteEntity other = (AbstractNamedRemoteEntity) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj) && - ((this.name == null && other.getName() == null) || - (this.name != null && - this.name.equals(other.getName()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - if (getName() != null) { - _hashCode += getName().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(AbstractNamedRemoteEntity.class, true); - - static { - typeDesc.setXmlType( - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "AbstractNamedRemoteEntity")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("name"); - elemField.setXmlName(new javax.xml.namespace.QName("", "name")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/AbstractRemoteConstant.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/AbstractRemoteConstant.java deleted file mode 100644 index a54d82ef6bf6..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/AbstractRemoteConstant.java +++ /dev/null @@ -1,170 +0,0 @@ -/** - * AbstractRemoteConstant.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public abstract class AbstractRemoteConstant extends AbstractNamedRemoteEntity - implements java.io.Serializable { - private String description; - - private String icon; - - public AbstractRemoteConstant() { - } - - public AbstractRemoteConstant( - String id, - String name, - String description, - String icon) { - super( - id, - name); - this.description = description; - this.icon = icon; - } - - - /** - * Gets the description value for this AbstractRemoteConstant. - * - * @return description - */ - public String getDescription() { - return description; - } - - - /** - * Sets the description value for this AbstractRemoteConstant. - * - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - - - /** - * Gets the icon value for this AbstractRemoteConstant. - * - * @return icon - */ - public String getIcon() { - return icon; - } - - - /** - * Sets the icon value for this AbstractRemoteConstant. - * - * @param icon - */ - public void setIcon(String icon) { - this.icon = icon; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof AbstractRemoteConstant)) { - return false; - } - AbstractRemoteConstant other = (AbstractRemoteConstant) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj) && - ((this.description == null && other.getDescription() == null) || - (this.description != null && - this.description.equals(other.getDescription()))) && - ((this.icon == null && other.getIcon() == null) || - (this.icon != null && - this.icon.equals(other.getIcon()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - if (getDescription() != null) { - _hashCode += getDescription().hashCode(); - } - if (getIcon() != null) { - _hashCode += getIcon().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(AbstractRemoteConstant.class, true); - - static { - typeDesc.setXmlType( - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "AbstractRemoteConstant")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("description"); - elemField.setXmlName(new javax.xml.namespace.QName("", "description")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("icon"); - elemField.setXmlName(new javax.xml.namespace.QName("", "icon")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/AbstractRemoteEntity.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/AbstractRemoteEntity.java deleted file mode 100644 index 045ab56611d3..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/AbstractRemoteEntity.java +++ /dev/null @@ -1,127 +0,0 @@ -/** - * AbstractRemoteEntity.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public abstract class AbstractRemoteEntity implements java.io.Serializable { - private String id; - - public AbstractRemoteEntity() { - } - - public AbstractRemoteEntity( - String id) { - this.id = id; - } - - - /** - * Gets the id value for this AbstractRemoteEntity. - * - * @return id - */ - public String getId() { - return id; - } - - - /** - * Sets the id value for this AbstractRemoteEntity. - * - * @param id - */ - public void setId(String id) { - this.id = id; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof AbstractRemoteEntity)) { - return false; - } - AbstractRemoteEntity other = (AbstractRemoteEntity) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - ((this.id == null && other.getId() == null) || - (this.id != null && - this.id.equals(other.getId()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - if (getId() != null) { - _hashCode += getId().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(AbstractRemoteEntity.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "AbstractRemoteEntity")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("id"); - elemField.setXmlName(new javax.xml.namespace.QName("", "id")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/IssueServiceImpl$RemoteWorklogImpl.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/IssueServiceImpl$RemoteWorklogImpl.java deleted file mode 100644 index a2df6fce14c6..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/IssueServiceImpl$RemoteWorklogImpl.java +++ /dev/null @@ -1,117 +0,0 @@ -/** - * IssueServiceImpl$RemoteWorklogImpl.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - - -public class IssueServiceImpl$RemoteWorklogImpl extends RemoteWorklog - implements java.io.Serializable { - public IssueServiceImpl$RemoteWorklogImpl() { - } - - public IssueServiceImpl$RemoteWorklogImpl( - String author, - String comment, - java.util.Calendar created, - String groupLevel, - String id, - String roleLevelId, - java.util.Calendar startDate, - String timeSpent, - long timeSpentInSeconds, - String updateAuthor, - java.util.Calendar updated) { - super( - author, - comment, - created, - groupLevel, - id, - roleLevelId, - startDate, - timeSpent, - timeSpentInSeconds, - updateAuthor, - updated); - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof IssueServiceImpl$RemoteWorklogImpl)) { - return false; - } - IssueServiceImpl$RemoteWorklogImpl other = (IssueServiceImpl$RemoteWorklogImpl) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(IssueServiceImpl$RemoteWorklogImpl.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://service.soap.rpc.jira.atlassian.com", - "IssueServiceImpl$RemoteWorklogImpl")); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/JiraSoapService.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/JiraSoapService.java deleted file mode 100644 index 98dbe7f72902..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/JiraSoapService.java +++ /dev/null @@ -1,495 +0,0 @@ -/** - * JiraSoapService.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public interface JiraSoapService extends java.rmi.Remote { - public RemoteComment getComment(String in0, long in1) - throws java.rmi.RemoteException, RemoteException; - - public RemoteGroup createGroup(String in0, String in1, - RemoteUser in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public RemoteSecurityLevel getSecurityLevel(String in0, - String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteException; - - public RemoteServerInfo getServerInfo(String in0) - throws java.rmi.RemoteException; - - public RemoteGroup getGroup(String in0, String in1) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public RemoteUser createUser(String in0, String in1, - String in2, String in3, String in4) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public RemoteUser getUser(String in0, String in1) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException; - - public String login(String in0, String in1) throws java.rmi.RemoteException, - RemoteAuthenticationException, - RemoteException; - - public RemoteIssue getIssue(String in0, String in1) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public RemoteIssue createIssue(String in0, - RemoteIssue in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public RemoteNamedObject[] getAvailableActions(String in0, - String in1) throws java.rmi.RemoteException, RemoteException; - - public RemoteIssue updateIssue(String in0, String in1, - RemoteFieldValue[] in2) - throws java.rmi.RemoteException, RemoteException; - - public RemoteConfiguration getConfiguration(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public RemoteComponent[] getComponents(String in0, - String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public RemoteProject updateProject(String in0, - RemoteProject in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public RemoteProject getProjectByKey(String in0, String in1) - throws java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public RemotePriority[] getPriorities(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException; - - public RemoteResolution[] getResolutions(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException; - - public RemoteIssueType[] getIssueTypes(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException; - - public RemoteStatus[] getStatuses(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException; - - public RemoteIssueType[] getSubTaskIssueTypes(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException; - - public RemoteProjectRole[] getProjectRoles(String in0) - throws java.rmi.RemoteException, RemoteException; - - public RemoteProjectRole getProjectRole(String in0, long in1) - throws java.rmi.RemoteException, RemoteException; - - public RemoteProjectRoleActors getProjectRoleActors(String in0, - RemoteProjectRole in1, - RemoteProject in2) - throws java.rmi.RemoteException, RemoteException; - - public RemoteRoleActors getDefaultRoleActors(String in0, - RemoteProjectRole in1) - throws java.rmi.RemoteException, RemoteException; - - public void removeAllRoleActorsByNameAndType(String in0, String in1, String in2) - throws java.rmi.RemoteException, RemoteException; - - public void removeAllRoleActorsByProject(String in0, RemoteProject in1) - throws java.rmi.RemoteException, RemoteException; - - public void deleteProjectRole(String in0, RemoteProjectRole in1, - boolean in2) throws java.rmi.RemoteException, RemoteException; - - public void updateProjectRole(String in0, RemoteProjectRole in1) - throws java.rmi.RemoteException, RemoteException; - - public RemoteProjectRole createProjectRole(String in0, - RemoteProjectRole in1) - throws java.rmi.RemoteException, RemoteException; - - public boolean isProjectRoleNameUnique(String in0, String in1) - throws java.rmi.RemoteException, RemoteException; - - public void addActorsToProjectRole(String in0, String[] in1, - RemoteProjectRole in2, - RemoteProject in3, String in4) - throws java.rmi.RemoteException, RemoteException; - - public void removeActorsFromProjectRole(String in0, String[] in1, - RemoteProjectRole in2, - RemoteProject in3, String in4) - throws java.rmi.RemoteException, RemoteException; - - public void addDefaultActorsToProjectRole(String in0, String[] in1, - RemoteProjectRole in2, String in3) - throws java.rmi.RemoteException, RemoteException; - - public void removeDefaultActorsFromProjectRole(String in0, String[] in1, - RemoteProjectRole in2, String in3) - throws java.rmi.RemoteException, RemoteException; - - public RemoteScheme[] getAssociatedNotificationSchemes(String in0, - RemoteProjectRole in1) - throws java.rmi.RemoteException, RemoteException; - - public RemoteScheme[] getAssociatedPermissionSchemes(String in0, - RemoteProjectRole in1) - throws java.rmi.RemoteException, RemoteException; - - public RemoteField[] getCustomFields(String in0) - throws java.rmi.RemoteException, RemoteException; - - public RemoteComment[] getComments(String in0, String in1) - throws java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public RemoteFilter[] getFavouriteFilters(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public void archiveVersion(String in0, String in1, String in2, boolean in3) - throws java.rmi.RemoteException, RemoteException; - - public RemoteVersion[] getVersions(String in0, String in1) - throws java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public RemoteProject createProject(String in0, String in1, - String in2, String in3, String in4, String in5, - RemotePermissionScheme in6, - RemoteScheme in7, - RemoteScheme in8) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public void addComment(String in0, String in1, - RemoteComment in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public RemoteField[] getFieldsForEdit(String in0, String in1) - throws java.rmi.RemoteException, RemoteException; - - public RemoteIssueType[] getIssueTypesForProject(String in0, - String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteAuthenticationException; - - public RemoteIssueType[] getSubTaskIssueTypesForProject(String in0, - String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteAuthenticationException; - - public void addUserToGroup(String in0, RemoteGroup in1, - RemoteUser in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public void removeUserFromGroup(String in0, RemoteGroup in1, - RemoteUser in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public boolean logout(String in0) throws java.rmi.RemoteException; - - public RemoteProject getProjectById(String in0, long in1) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public RemoteProject getProjectWithSchemesById(String in0, long in1) - throws java.rmi.RemoteException, RemoteException; - - public void deleteProject(String in0, String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public void releaseVersion(String in0, String in1, - RemoteVersion in2) - throws java.rmi.RemoteException, RemoteException; - - public RemoteSecurityLevel[] getSecurityLevels(String in0, - String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteException; - - public void deleteIssue(String in0, String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public RemoteIssue createIssueWithSecurityLevel(String in0, - RemoteIssue in1, long in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public boolean addAttachmentsToIssue(String in0, String in1, String[] in2, byte[][] in3) - throws java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public RemoteAttachment[] getAttachmentsFromIssue(String in0, - String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public boolean hasPermissionToEditComment(String in0, - RemoteComment in1) - throws java.rmi.RemoteException, RemoteException; - - public RemoteComment editComment(String in0, - RemoteComment in1) - throws java.rmi.RemoteException, RemoteException; - - public RemoteField[] getFieldsForAction(String in0, - String in1, String in2) - throws java.rmi.RemoteException, RemoteException; - - public RemoteIssue progressWorkflowAction(String in0, - String in1, String in2, RemoteFieldValue[] in3) - throws java.rmi.RemoteException, RemoteException; - - public RemoteIssue getIssueById(String in0, String in1) - throws java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public RemoteWorklog addWorklogWithNewRemainingEstimate(String in0, - String in1, RemoteWorklog in2, String in3) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteException; - - public RemoteWorklog addWorklogAndAutoAdjustRemainingEstimate( - String in0, String in1, RemoteWorklog in2) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteException; - - public RemoteWorklog addWorklogAndRetainRemainingEstimate(String in0, - String in1, RemoteWorklog in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteException; - - public void deleteWorklogWithNewRemainingEstimate(String in0, String in1, String in2) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteException; - - public void deleteWorklogAndAutoAdjustRemainingEstimate(String in0, String in1) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteException; - - public void deleteWorklogAndRetainRemainingEstimate(String in0, String in1) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteException; - - public void updateWorklogWithNewRemainingEstimate(String in0, - RemoteWorklog in1, String in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteException; - - public void updateWorklogAndAutoAdjustRemainingEstimate(String in0, - RemoteWorklog in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteException; - - public void updateWorklogAndRetainRemainingEstimate(String in0, - RemoteWorklog in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteException; - - public RemoteWorklog[] getWorklogs(String in0, String in1) - throws java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteException; - - public boolean hasPermissionToCreateWorklog(String in0, String in1) throws java.rmi.RemoteException, - RemoteValidationException, - RemoteException; - - public boolean hasPermissionToDeleteWorklog(String in0, String in1) throws java.rmi.RemoteException, - RemoteValidationException, - RemoteException; - - public boolean hasPermissionToUpdateWorklog(String in0, String in1) throws java.rmi.RemoteException, - RemoteValidationException, - RemoteException; - - public RemoteScheme[] getNotificationSchemes(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public RemotePermissionScheme[] getPermissionSchemes(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public RemotePermissionScheme createPermissionScheme(String in0, - String in1, String in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public void deletePermissionScheme(String in0, String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public RemotePermissionScheme addPermissionTo(String in0, - RemotePermissionScheme in1, - RemotePermission in2, - RemoteEntity in3) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public RemotePermissionScheme deletePermissionFrom(String in0, - RemotePermissionScheme in1, - RemotePermission in2, - RemoteEntity in3) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public RemotePermission[] getAllPermissions(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public long getIssueCountForFilter(String in0, String in1) - throws java.rmi.RemoteException, RemoteException; - - public RemoteIssue[] getIssuesFromTextSearch(String in0, - String in1) throws java.rmi.RemoteException, RemoteException; - - public RemoteIssue[] getIssuesFromTextSearchWithProject(String in0, - String[] in1, String in2, int in3) - throws java.rmi.RemoteException, RemoteException; - - public void deleteUser(String in0, String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public RemoteGroup updateGroup(String in0, - RemoteGroup in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public void deleteGroup(String in0, String in1, String in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public void refreshCustomFields(String in0) - throws java.rmi.RemoteException, RemoteException; - - public RemoteProject[] getProjectsNoSchemes(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public RemoteVersion addVersion(String in0, String in1, - RemoteVersion in2) - throws java.rmi.RemoteException, RemoteException; - - public RemoteFilter[] getSavedFilters(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public boolean addBase64EncodedAttachmentsToIssue(String in0, String in1, String[] in2, - String[] in3) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public RemoteProject createProjectFromObject(String in0, - RemoteProject in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException; - - public RemoteScheme[] getSecuritySchemes(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException; - - public RemoteIssue[] getIssuesFromFilter(String in0, - String in1) throws java.rmi.RemoteException, RemoteException; - - public RemoteIssue[] getIssuesFromFilterWithLimit(String in0, - String in1, int in2, int in3) - throws java.rmi.RemoteException, RemoteException; - - public RemoteIssue[] getIssuesFromTextSearchWithLimit(String in0, - String in1, int in2, int in3) - throws java.rmi.RemoteException, RemoteException; -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/JiraSoapServiceService.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/JiraSoapServiceService.java deleted file mode 100644 index 69943b244e45..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/JiraSoapServiceService.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - * JiraSoapServiceService.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public interface JiraSoapServiceService extends javax.xml.rpc.Service { - public String getJirasoapserviceV2Address(); - - public JiraSoapService getJirasoapserviceV2() - throws javax.xml.rpc.ServiceException; - - public JiraSoapService getJirasoapserviceV2(java.net.URL portAddress) - throws javax.xml.rpc.ServiceException; -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/JiraSoapServiceServiceLocator.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/JiraSoapServiceServiceLocator.java deleted file mode 100644 index 0f90c5d59b49..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/JiraSoapServiceServiceLocator.java +++ /dev/null @@ -1,179 +0,0 @@ -/** - * JiraSoapServiceServiceLocator.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -import org.apache.axis.EngineConfiguration; - -public class JiraSoapServiceServiceLocator extends org.apache.axis.client.Service - implements JiraSoapServiceService { - - public JiraSoapServiceServiceLocator() { - } - - - public JiraSoapServiceServiceLocator(EngineConfiguration config) { - super(config); - } - - public JiraSoapServiceServiceLocator(String wsdlLoc, javax.xml.namespace.QName sName) - throws javax.xml.rpc.ServiceException { - super(wsdlLoc, sName); - } - - // Use to get a proxy class for JirasoapserviceV2 - private String JirasoapserviceV2_address = "http://jira.atlassian.com/rpc/soap/jirasoapservice-v2"; - - public String getJirasoapserviceV2Address() { - return JirasoapserviceV2_address; - } - - // The WSDD service name defaults to the port name. - private String JirasoapserviceV2WSDDServiceName = "jirasoapservice-v2"; - - public String getJirasoapserviceV2WSDDServiceName() { - return JirasoapserviceV2WSDDServiceName; - } - - public void setJirasoapserviceV2WSDDServiceName(String name) { - JirasoapserviceV2WSDDServiceName = name; - } - - /* - overiden configuration from file client-config.wsdd - * */ - @Override - protected EngineConfiguration getEngineConfiguration() { - StringBuffer sb = new StringBuffer(); - - sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - + "<deployment name=\"defaultClientConfig\"\n" - + " xmlns=\"http://xml.apache.org/axis/wsdd/\"\n" - + " xmlns:java=\"http://xml.apache.org/axis/wsdd/providers/java\">\n" - + " <globalConfiguration>\n" - + " <parameter name=\"disablePrettyXML\" value=\"true\"/>\n" - + " <parameter name=\"enableNamespacePrefixOptimization\" value=\"false\"/>\n" - + " </globalConfiguration>"); - - sb.append("<transport name=\"http\" pivot=\"java:").append(org.apache.axis.transport.http.HTTPSender.class.getName()).append("\" />\r\n"); - sb.append("<transport name=\"local\" pivot=\"java:").append(org.apache.axis.transport.local.LocalSender.class.getName()).append("\" />\r\n"); - sb.append("<transport name=\"java\" pivot=\"java:").append(org.apache.axis.transport.java.JavaSender.class.getName()).append("\" />\r\n"); - sb.append("</deployment>\r\n"); - org.apache.axis.configuration.XMLStringProvider config = - new org.apache.axis.configuration.XMLStringProvider(sb.toString()); - return config; - } - - - public JiraSoapService getJirasoapserviceV2() - throws javax.xml.rpc.ServiceException { - java.net.URL endpoint; - try { - endpoint = new java.net.URL(JirasoapserviceV2_address); - } catch (java.net.MalformedURLException e) { - throw new javax.xml.rpc.ServiceException(e); - } - return getJirasoapserviceV2(endpoint); - } - - public JiraSoapService getJirasoapserviceV2(java.net.URL portAddress) - throws javax.xml.rpc.ServiceException { - try { - JirasoapserviceV2SoapBindingStub _stub - = new JirasoapserviceV2SoapBindingStub(portAddress, - this); - _stub.setPortName(getJirasoapserviceV2WSDDServiceName()); - return _stub; - } catch (org.apache.axis.AxisFault e) { - return null; - } - } - - public void setJirasoapserviceV2EndpointAddress(String address) { - JirasoapserviceV2_address = address; - } - - /** - * For the given interface, get the stub implementation. - * If this service has no port for the given interface, - * then ServiceException is thrown. - */ - public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException { - try { - if (JiraSoapService.class - .isAssignableFrom(serviceEndpointInterface)) { - JirasoapserviceV2SoapBindingStub _stub - = new JirasoapserviceV2SoapBindingStub( - new java.net.URL(JirasoapserviceV2_address), this); - _stub.setPortName(getJirasoapserviceV2WSDDServiceName()); - return _stub; - } - } catch (Throwable t) { - throw new javax.xml.rpc.ServiceException(t); - } - throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface: " + - (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName())); - } - - /** - * For the given interface, get the stub implementation. - * If this service has no port for the given interface, - * then ServiceException is thrown. - */ - public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) - throws javax.xml.rpc.ServiceException { - if (portName == null) { - return getPort(serviceEndpointInterface); - } - String inputPortName = portName.getLocalPart(); - if ("jirasoapservice-v2".equals(inputPortName)) { - return getJirasoapserviceV2(); - } else { - java.rmi.Remote _stub = getPort(serviceEndpointInterface); - ((org.apache.axis.client.Stub) _stub).setPortName(portName); - return _stub; - } - } - - public javax.xml.namespace.QName getServiceName() { - return new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "JiraSoapServiceService"); - } - - private java.util.HashSet ports = null; - - public java.util.Iterator getPorts() { - if (ports == null) { - ports = new java.util.HashSet(); - ports.add(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "jirasoapservice-v2")); - } - return ports.iterator(); - } - - /** - * Set the endpoint address for the specified port name. - */ - public void setEndpointAddress(String portName, String address) - throws javax.xml.rpc.ServiceException { - - if ("JirasoapserviceV2".equals(portName)) { - setJirasoapserviceV2EndpointAddress(address); - } else { // Unknown Port Name - throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName); - } - } - - /** - * Set the endpoint address for the specified port name. - */ - public void setEndpointAddress(javax.xml.namespace.QName portName, String address) - throws javax.xml.rpc.ServiceException { - setEndpointAddress(portName.getLocalPart(), address); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/JirasoapserviceV2SoapBindingStub.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/JirasoapserviceV2SoapBindingStub.java deleted file mode 100644 index 4a0c4cb7a411..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/JirasoapserviceV2SoapBindingStub.java +++ /dev/null @@ -1,8673 +0,0 @@ -/** - * JirasoapserviceV2SoapBindingStub.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - * - * pstefaniak, 18 Jan 2010: - * there is one manual change to this auto-generated file, around line 6738 - * see PL-1918 for details... - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -import javax.annotation.Generated; - -@Generated(value = "") -public class JirasoapserviceV2SoapBindingStub extends org.apache.axis.client.Stub - implements JiraSoapService { - private java.util.Vector cachedSerClasses = new java.util.Vector(); - private java.util.Vector cachedSerQNames = new java.util.Vector(); - private java.util.Vector cachedSerFactories = new java.util.Vector(); - private java.util.Vector cachedDeserFactories = new java.util.Vector(); - - static org.apache.axis.description.OperationDesc[] _operations; - - static { - _operations = new org.apache.axis.description.OperationDesc[100]; - _initOperationDesc1(); - _initOperationDesc2(); - _initOperationDesc3(); - _initOperationDesc4(); - _initOperationDesc5(); - _initOperationDesc6(); - _initOperationDesc7(); - _initOperationDesc8(); - _initOperationDesc9(); - _initOperationDesc10(); - } - - private static void _initOperationDesc1() { - org.apache.axis.description.OperationDesc oper; - org.apache.axis.description.ParameterDesc param; - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getComment"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteComment")); - oper.setReturnClass(RemoteComment.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getCommentReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[0] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("createGroup"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteUser"), - RemoteUser.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteGroup")); - oper.setReturnClass(RemoteGroup.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "createGroupReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[1] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getSecurityLevel"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteSecurityLevel")); - oper.setReturnClass(RemoteSecurityLevel.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getSecurityLevelReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[2] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getServerInfo"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteServerInfo")); - oper.setReturnClass(RemoteServerInfo.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getServerInfoReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - _operations[3] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getGroup"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteGroup")); - oper.setReturnClass(RemoteGroup.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getGroupReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[4] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("createUser"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in4"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteUser")); - oper.setReturnClass(RemoteUser.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "createUserReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[5] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getUser"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteUser")); - oper.setReturnClass(RemoteUser.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getUserReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - _operations[6] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("login"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - oper.setReturnClass(String.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "loginReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[7] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getIssue"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteIssue")); - oper.setReturnClass(RemoteIssue.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getIssueReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[8] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("createIssue"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteIssue"), - RemoteIssue.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteIssue")); - oper.setReturnClass(RemoteIssue.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "createIssueReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[9] = oper; - - } - - private static void _initOperationDesc2() { - org.apache.axis.description.OperationDesc oper; - org.apache.axis.description.ParameterDesc param; - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getAvailableActions"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteNamedObject")); - oper.setReturnClass(RemoteNamedObject[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getAvailableActionsReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[10] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("updateIssue"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName( - "http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "ArrayOf_tns1_RemoteFieldValue"), - RemoteFieldValue[].class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteIssue")); - oper.setReturnClass(RemoteIssue.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "updateIssueReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[11] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getConfiguration"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteConfiguration")); - oper.setReturnClass(RemoteConfiguration.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getConfigurationReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[12] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getComponents"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteComponent")); - oper.setReturnClass(RemoteComponent[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getComponentsReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[13] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("updateProject"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject"), - RemoteProject.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject")); - oper.setReturnClass(RemoteProject.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "updateProjectReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[14] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getProjectByKey"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject")); - oper.setReturnClass(RemoteProject.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getProjectByKeyReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[15] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getPriorities"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemotePriority")); - oper.setReturnClass(RemotePriority[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getPrioritiesReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - _operations[16] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getResolutions"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteResolution")); - oper.setReturnClass(RemoteResolution[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getResolutionsReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - _operations[17] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getIssueTypes"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteIssueType")); - oper.setReturnClass(RemoteIssueType[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getIssueTypesReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - _operations[18] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getStatuses"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteStatus")); - oper.setReturnClass(RemoteStatus[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getStatusesReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - _operations[19] = oper; - - } - - private static void _initOperationDesc3() { - org.apache.axis.description.OperationDesc oper; - org.apache.axis.description.ParameterDesc param; - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getSubTaskIssueTypes"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteIssueType")); - oper.setReturnClass(RemoteIssueType[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getSubTaskIssueTypesReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - _operations[20] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getProjectRoles"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteProjectRole")); - oper.setReturnClass(RemoteProjectRole[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getProjectRolesReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[21] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getProjectRole"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole")); - oper.setReturnClass(RemoteProjectRole.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getProjectRoleReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[22] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getProjectRoleActors"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole"), - RemoteProjectRole.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject"), - RemoteProject.class, false, false); - oper.addParameter(param); - oper.setReturnType( - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRoleActors")); - oper.setReturnClass(RemoteProjectRoleActors.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getProjectRoleActorsReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[23] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getDefaultRoleActors"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole"), - RemoteProjectRole.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteRoleActors")); - oper.setReturnClass(RemoteRoleActors.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getDefaultRoleActorsReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[24] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("removeAllRoleActorsByNameAndType"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[25] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("removeAllRoleActorsByProject"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject"), - RemoteProject.class, false, false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[26] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("deleteProjectRole"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole"), - RemoteProjectRole.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"), boolean.class, false, false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[27] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("updateProjectRole"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole"), - RemoteProjectRole.class, false, false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[28] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("createProjectRole"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole"), - RemoteProjectRole.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole")); - oper.setReturnClass(RemoteProjectRole.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "createProjectRoleReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[29] = oper; - - } - - private static void _initOperationDesc4() { - org.apache.axis.description.OperationDesc oper; - org.apache.axis.description.ParameterDesc param; - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("isProjectRoleNameUnique"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - oper.setReturnClass(boolean.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "isProjectRoleNameUniqueReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[30] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("addActorsToProjectRole"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "ArrayOf_xsd_string"), - String[].class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole"), - RemoteProjectRole.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject"), - RemoteProject.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in4"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[31] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("removeActorsFromProjectRole"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "ArrayOf_xsd_string"), - String[].class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole"), - RemoteProjectRole.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject"), - RemoteProject.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in4"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[32] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("addDefaultActorsToProjectRole"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "ArrayOf_xsd_string"), - String[].class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole"), - RemoteProjectRole.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[33] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("removeDefaultActorsFromProjectRole"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "ArrayOf_xsd_string"), - String[].class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole"), - RemoteProjectRole.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[34] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getAssociatedNotificationSchemes"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole"), - RemoteProjectRole.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteScheme")); - oper.setReturnClass(RemoteScheme[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getAssociatedNotificationSchemesReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[35] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getAssociatedPermissionSchemes"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole"), - RemoteProjectRole.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteScheme")); - oper.setReturnClass(RemoteScheme[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getAssociatedPermissionSchemesReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[36] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getCustomFields"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteField")); - oper.setReturnClass(RemoteField[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getCustomFieldsReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[37] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getComments"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteComment")); - oper.setReturnClass(RemoteComment[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getCommentsReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[38] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getFavouriteFilters"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteFilter")); - oper.setReturnClass(RemoteFilter[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getFavouriteFiltersReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[39] = oper; - - } - - private static void _initOperationDesc5() { - org.apache.axis.description.OperationDesc oper; - org.apache.axis.description.ParameterDesc param; - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("archiveVersion"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"), boolean.class, false, false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[40] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getVersions"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteVersion")); - oper.setReturnClass(RemoteVersion[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getVersionsReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[41] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("createProject"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in4"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in5"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in6"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermissionScheme"), - RemotePermissionScheme.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in7"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteScheme"), - RemoteScheme.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in8"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteScheme"), - RemoteScheme.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject")); - oper.setReturnClass(RemoteProject.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "createProjectReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[42] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("addComment"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteComment"), - RemoteComment.class, false, false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[43] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getFieldsForEdit"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteField")); - oper.setReturnClass(RemoteField[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getFieldsForEditReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[44] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getIssueTypesForProject"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteIssueType")); - oper.setReturnClass(RemoteIssueType[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getIssueTypesForProjectReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - _operations[45] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getSubTaskIssueTypesForProject"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteIssueType")); - oper.setReturnClass(RemoteIssueType[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getSubTaskIssueTypesForProjectReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - _operations[46] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("addUserToGroup"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteGroup"), - RemoteGroup.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteUser"), - RemoteUser.class, false, false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[47] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("removeUserFromGroup"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteGroup"), - RemoteGroup.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteUser"), - RemoteUser.class, false, false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[48] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("logout"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - oper.setReturnClass(boolean.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "logoutReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - _operations[49] = oper; - - } - - private static void _initOperationDesc6() { - org.apache.axis.description.OperationDesc oper; - org.apache.axis.description.ParameterDesc param; - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getProjectById"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject")); - oper.setReturnClass(RemoteProject.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getProjectByIdReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[50] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getProjectWithSchemesById"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject")); - oper.setReturnClass(RemoteProject.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getProjectWithSchemesByIdReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[51] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("deleteProject"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[52] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("releaseVersion"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteVersion"), - RemoteVersion.class, false, false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[53] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getSecurityLevels"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteSecurityLevel")); - oper.setReturnClass(RemoteSecurityLevel[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getSecurityLevelsReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[54] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("deleteIssue"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[55] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("createIssueWithSecurityLevel"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteIssue"), - RemoteIssue.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteIssue")); - oper.setReturnClass(RemoteIssue.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "createIssueWithSecurityLevelReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[56] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("addAttachmentsToIssue"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "ArrayOf_xsd_string"), - String[].class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName( - "http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "ArrayOf_xsd_base64Binary"), byte[][].class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - oper.setReturnClass(boolean.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "addAttachmentsToIssueReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[57] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getAttachmentsFromIssue"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteAttachment")); - oper.setReturnClass(RemoteAttachment[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getAttachmentsFromIssueReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[58] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("hasPermissionToEditComment"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteComment"), - RemoteComment.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - oper.setReturnClass(boolean.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "hasPermissionToEditCommentReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[59] = oper; - - } - - private static void _initOperationDesc7() { - org.apache.axis.description.OperationDesc oper; - org.apache.axis.description.ParameterDesc param; - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("editComment"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteComment"), - RemoteComment.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteComment")); - oper.setReturnClass(RemoteComment.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "editCommentReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[60] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getFieldsForAction"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteField")); - oper.setReturnClass(RemoteField[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getFieldsForActionReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[61] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("progressWorkflowAction"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName( - "http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "ArrayOf_tns1_RemoteFieldValue"), - RemoteFieldValue[].class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteIssue")); - oper.setReturnClass(RemoteIssue.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "progressWorkflowActionReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[62] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getIssueById"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteIssue")); - oper.setReturnClass(RemoteIssue.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getIssueByIdReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[63] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("addWorklogWithNewRemainingEstimate"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteWorklog"), - RemoteWorklog.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteWorklog")); - oper.setReturnClass(RemoteWorklog.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "addWorklogWithNewRemainingEstimateReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[64] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("addWorklogAndAutoAdjustRemainingEstimate"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteWorklog"), - RemoteWorklog.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteWorklog")); - oper.setReturnClass(RemoteWorklog.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "addWorklogAndAutoAdjustRemainingEstimateReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[65] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("addWorklogAndRetainRemainingEstimate"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteWorklog"), - RemoteWorklog.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteWorklog")); - oper.setReturnClass(RemoteWorklog.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "addWorklogAndRetainRemainingEstimateReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[66] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("deleteWorklogWithNewRemainingEstimate"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[67] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("deleteWorklogAndAutoAdjustRemainingEstimate"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[68] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("deleteWorklogAndRetainRemainingEstimate"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[69] = oper; - - } - - private static void _initOperationDesc8() { - org.apache.axis.description.OperationDesc oper; - org.apache.axis.description.ParameterDesc param; - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("updateWorklogWithNewRemainingEstimate"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteWorklog"), - RemoteWorklog.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[70] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("updateWorklogAndAutoAdjustRemainingEstimate"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteWorklog"), - RemoteWorklog.class, false, false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[71] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("updateWorklogAndRetainRemainingEstimate"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteWorklog"), - RemoteWorklog.class, false, false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[72] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getWorklogs"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteWorklog")); - oper.setReturnClass(RemoteWorklog[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getWorklogsReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[73] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("hasPermissionToCreateWorklog"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - oper.setReturnClass(boolean.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "hasPermissionToCreateWorklogReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[74] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("hasPermissionToDeleteWorklog"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - oper.setReturnClass(boolean.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "hasPermissionToDeleteWorklogReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[75] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("hasPermissionToUpdateWorklog"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - oper.setReturnClass(boolean.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "hasPermissionToUpdateWorklogReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[76] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getNotificationSchemes"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteScheme")); - oper.setReturnClass(RemoteScheme[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getNotificationSchemesReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[77] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getPermissionSchemes"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemotePermissionScheme")); - oper.setReturnClass(RemotePermissionScheme[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getPermissionSchemesReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[78] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("createPermissionScheme"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermissionScheme")); - oper.setReturnClass(RemotePermissionScheme.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "createPermissionSchemeReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[79] = oper; - - } - - private static void _initOperationDesc9() { - org.apache.axis.description.OperationDesc oper; - org.apache.axis.description.ParameterDesc param; - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("deletePermissionScheme"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[80] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("addPermissionTo"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermissionScheme"), - RemotePermissionScheme.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermission"), - RemotePermission.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteEntity"), - RemoteEntity.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermissionScheme")); - oper.setReturnClass(RemotePermissionScheme.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "addPermissionToReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[81] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("deletePermissionFrom"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermissionScheme"), - RemotePermissionScheme.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermission"), - RemotePermission.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteEntity"), - RemoteEntity.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermissionScheme")); - oper.setReturnClass(RemotePermissionScheme.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "deletePermissionFromReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[82] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getAllPermissions"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemotePermission")); - oper.setReturnClass(RemotePermission[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getAllPermissionsReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[83] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getIssueCountForFilter"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long")); - oper.setReturnClass(long.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getIssueCountForFilterReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[84] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getIssuesFromTextSearch"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteIssue")); - oper.setReturnClass(RemoteIssue[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getIssuesFromTextSearchReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[85] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getIssuesFromTextSearchWithProject"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "ArrayOf_xsd_string"), - String[].class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteIssue")); - oper.setReturnClass(RemoteIssue[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getIssuesFromTextSearchWithProjectReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[86] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("deleteUser"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[87] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("updateGroup"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteGroup"), - RemoteGroup.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteGroup")); - oper.setReturnClass(RemoteGroup.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "updateGroupReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[88] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("deleteGroup"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[89] = oper; - - } - - private static void _initOperationDesc10() { - org.apache.axis.description.OperationDesc oper; - org.apache.axis.description.ParameterDesc param; - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("refreshCustomFields"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[90] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getProjectsNoSchemes"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteProject")); - oper.setReturnClass(RemoteProject[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getProjectsNoSchemesReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[91] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("addVersion"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteVersion"), - RemoteVersion.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteVersion")); - oper.setReturnClass(RemoteVersion.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "addVersionReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[92] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getSavedFilters"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteFilter")); - oper.setReturnClass(RemoteFilter[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getSavedFiltersReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[93] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("addBase64EncodedAttachmentsToIssue"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "ArrayOf_xsd_string"), - String[].class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "ArrayOf_xsd_string"), - String[].class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - oper.setReturnClass(boolean.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "addBase64EncodedAttachmentsToIssueReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[94] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("createProjectFromObject"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject"), - RemoteProject.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject")); - oper.setReturnClass(RemoteProject.class); - oper.setReturnQName(new javax.xml.namespace.QName("", "createProjectFromObjectReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteValidationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[95] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getSecuritySchemes"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteScheme")); - oper.setReturnClass(RemoteScheme[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getSecuritySchemesReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemotePermissionException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteAuthenticationException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"), - true - )); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[96] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getIssuesFromFilter"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteIssue")); - oper.setReturnClass(RemoteIssue[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getIssuesFromFilterReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[97] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getIssuesFromFilterWithLimit"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteIssue")); - oper.setReturnClass(RemoteIssue[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getIssuesFromFilterWithLimitReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[98] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("getIssuesFromTextSearchWithLimit"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in0"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in1"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, - false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in2"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, false, false); - oper.addParameter(param); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "in3"), - org.apache.axis.description.ParameterDesc.IN, - new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteIssue")); - oper.setReturnClass(RemoteIssue[].class); - oper.setReturnQName(new javax.xml.namespace.QName("", "getIssuesFromTextSearchWithLimitReturn")); - oper.setStyle(org.apache.axis.constants.Style.RPC); - oper.setUse(org.apache.axis.constants.Use.ENCODED); - oper.addFault(new org.apache.axis.description.FaultDesc( - new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "fault"), - "com.atlassian.connector.commons.jira.soap.axis.RemoteException", - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"), - true - )); - _operations[99] = oper; - - } - - public JirasoapserviceV2SoapBindingStub() throws org.apache.axis.AxisFault { - this(null); - } - - public JirasoapserviceV2SoapBindingStub(java.net.URL endpointURL, javax.xml.rpc.Service service) - throws org.apache.axis.AxisFault { - this(service); - super.cachedEndpoint = endpointURL; - } - - public JirasoapserviceV2SoapBindingStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { - if (service == null) { - super.service = new org.apache.axis.client.Service(); - } else { - super.service = service; - } - ((org.apache.axis.client.Service) super.service).setTypeMappingVersion("1.1"); - Class cls; - javax.xml.namespace.QName qName; - javax.xml.namespace.QName qName2; - Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class; - Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class; - Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class; - Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class; - Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class; - Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class; - Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class; - Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class; - Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class; - Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class; - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "AbstractNamedRemoteEntity"); - cachedSerQNames.add(qName); - cls = AbstractNamedRemoteEntity.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "AbstractRemoteConstant"); - cachedSerQNames.add(qName); - cls = AbstractRemoteConstant.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "AbstractRemoteEntity"); - cachedSerQNames.add(qName); - cls = AbstractRemoteEntity.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteAttachment"); - cachedSerQNames.add(qName); - cls = RemoteAttachment.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteComment"); - cachedSerQNames.add(qName); - cls = RemoteComment.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteComponent"); - cachedSerQNames.add(qName); - cls = RemoteComponent.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteConfiguration"); - cachedSerQNames.add(qName); - cls = RemoteConfiguration.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteCustomFieldValue"); - cachedSerQNames.add(qName); - cls = RemoteCustomFieldValue.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteEntity"); - cachedSerQNames.add(qName); - cls = RemoteEntity.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteField"); - cachedSerQNames.add(qName); - cls = RemoteField.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteFieldValue"); - cachedSerQNames.add(qName); - cls = RemoteFieldValue.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteFilter"); - cachedSerQNames.add(qName); - cls = RemoteFilter.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteGroup"); - cachedSerQNames.add(qName); - cls = RemoteGroup.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteIssue"); - cachedSerQNames.add(qName); - cls = RemoteIssue.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteIssueType"); - cachedSerQNames.add(qName); - cls = RemoteIssueType.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteNamedObject"); - cachedSerQNames.add(qName); - cls = RemoteNamedObject.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermission"); - cachedSerQNames.add(qName); - cls = RemotePermission.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermissionMapping"); - cachedSerQNames.add(qName); - cls = RemotePermissionMapping.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermissionScheme"); - cachedSerQNames.add(qName); - cls = RemotePermissionScheme.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePriority"); - cachedSerQNames.add(qName); - cls = RemotePriority.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject"); - cachedSerQNames.add(qName); - cls = RemoteProject.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole"); - cachedSerQNames.add(qName); - cls = RemoteProjectRole.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRoleActors"); - cachedSerQNames.add(qName); - cls = RemoteProjectRoleActors.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteResolution"); - cachedSerQNames.add(qName); - cls = RemoteResolution.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteRoleActor"); - cachedSerQNames.add(qName); - cls = RemoteRoleActor.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteRoleActors"); - cachedSerQNames.add(qName); - cls = RemoteRoleActors.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteScheme"); - cachedSerQNames.add(qName); - cls = RemoteScheme.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteSecurityLevel"); - cachedSerQNames.add(qName); - cls = RemoteSecurityLevel.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteServerInfo"); - cachedSerQNames.add(qName); - cls = RemoteServerInfo.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteStatus"); - cachedSerQNames.add(qName); - cls = RemoteStatus.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteTimeInfo"); - cachedSerQNames.add(qName); - cls = RemoteTimeInfo.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteUser"); - cachedSerQNames.add(qName); - cls = RemoteUser.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteVersion"); - cachedSerQNames.add(qName); - cls = RemoteVersion.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteWorklog"); - cachedSerQNames.add(qName); - cls = RemoteWorklog.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException"); - cachedSerQNames.add(qName); - cls = RemoteAuthenticationException.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException"); - cachedSerQNames.add(qName); - cls = RemoteException.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException"); - cachedSerQNames.add(qName); - cls = RemotePermissionException.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException"); - cachedSerQNames.add(qName); - cls = RemoteValidationException.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteAttachment"); - cachedSerQNames.add(qName); - cls = RemoteAttachment[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteAttachment"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteComment"); - cachedSerQNames.add(qName); - cls = RemoteComment[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteComment"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteComponent"); - cachedSerQNames.add(qName); - cls = RemoteComponent[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteComponent"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteCustomFieldValue"); - cachedSerQNames.add(qName); - cls = RemoteCustomFieldValue[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteCustomFieldValue"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteEntity"); - cachedSerQNames.add(qName); - cls = RemoteEntity[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteEntity"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteField"); - cachedSerQNames.add(qName); - cls = RemoteField[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteField"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteFieldValue"); - cachedSerQNames.add(qName); - cls = RemoteFieldValue[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteFieldValue"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteFilter"); - cachedSerQNames.add(qName); - cls = RemoteFilter[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteFilter"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteIssue"); - cachedSerQNames.add(qName); - cls = RemoteIssue[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteIssue"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteIssueType"); - cachedSerQNames.add(qName); - cls = RemoteIssueType[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteIssueType"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteNamedObject"); - cachedSerQNames.add(qName); - cls = RemoteNamedObject[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteNamedObject"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemotePermission"); - cachedSerQNames.add(qName); - cls = RemotePermission[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermission"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemotePermissionMapping"); - cachedSerQNames.add(qName); - cls = RemotePermissionMapping[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermissionMapping"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemotePermissionScheme"); - cachedSerQNames.add(qName); - cls = RemotePermissionScheme[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermissionScheme"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemotePriority"); - cachedSerQNames.add(qName); - cls = RemotePriority[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePriority"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteProject"); - cachedSerQNames.add(qName); - cls = RemoteProject[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteProjectRole"); - cachedSerQNames.add(qName); - cls = RemoteProjectRole[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteResolution"); - cachedSerQNames.add(qName); - cls = RemoteResolution[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteResolution"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteRoleActor"); - cachedSerQNames.add(qName); - cls = RemoteRoleActor[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteRoleActor"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteScheme"); - cachedSerQNames.add(qName); - cls = RemoteScheme[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteScheme"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteSecurityLevel"); - cachedSerQNames.add(qName); - cls = RemoteSecurityLevel[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteSecurityLevel"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteStatus"); - cachedSerQNames.add(qName); - cls = RemoteStatus[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteStatus"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteUser"); - cachedSerQNames.add(qName); - cls = RemoteUser[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteUser"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteVersion"); - cachedSerQNames.add(qName); - cls = RemoteVersion[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteVersion"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_tns1_RemoteWorklog"); - cachedSerQNames.add(qName); - cls = RemoteWorklog[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteWorklog"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", - "ArrayOf_xsd_base64Binary"); - cachedSerQNames.add(qName); - cls = byte[][].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "byte"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://jira.atlassian.com/rpc/soap/jirasoapservice-v2", "ArrayOf_xsd_string"); - cachedSerQNames.add(qName); - cls = String[].class; - cachedSerClasses.add(cls); - qName = new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"); - qName2 = null; - cachedSerFactories.add(new org.apache.axis.encoding.ser.ArraySerializerFactory(qName, qName2)); - cachedDeserFactories.add(new org.apache.axis.encoding.ser.ArrayDeserializerFactory()); - - qName = new javax.xml.namespace.QName("http://service.soap.rpc.jira.atlassian.com", - "IssueServiceImpl$RemoteWorklogImpl"); - cachedSerQNames.add(qName); - cls = IssueServiceImpl$RemoteWorklogImpl.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - } - - protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException { - try { - org.apache.axis.client.Call _call = super._createCall(); - if (super.maintainSessionSet) { - _call.setMaintainSession(super.maintainSession); - } - if (super.cachedUsername != null) { - _call.setUsername(super.cachedUsername); - } - if (super.cachedPassword != null) { - _call.setPassword(super.cachedPassword); - } - if (super.cachedEndpoint != null) { - _call.setTargetEndpointAddress(super.cachedEndpoint); - } - if (super.cachedTimeout != null) { - _call.setTimeout(super.cachedTimeout); - } - if (super.cachedPortName != null) { - _call.setPortName(super.cachedPortName); - } - java.util.Enumeration keys = super.cachedProperties.keys(); - while (keys.hasMoreElements()) { - String key = (String) keys.nextElement(); - _call.setProperty(key, super.cachedProperties.get(key)); - } - // All the type mapping information is registered - // when the first call is made. - // The type mapping information is actually registered in - // the TypeMappingRegistry of the service, which - // is the reason why registration is only needed for the first call. - synchronized (this) { - if (firstCall()) { - // must set encoding style before registering serializers - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setEncodingStyle(org.apache.axis.Constants.URI_SOAP11_ENC); - for (int i = 0; i < cachedSerFactories.size(); ++i) { - Class cls = (Class) cachedSerClasses.get(i); - javax.xml.namespace.QName qName = - (javax.xml.namespace.QName) cachedSerQNames.get(i); - Object x = cachedSerFactories.get(i); - if (x instanceof Class) { - Class sf = (Class) - cachedSerFactories.get(i); - Class df = (Class) - cachedDeserFactories.get(i); - _call.registerTypeMapping(cls, qName, sf, df, false); - } else if (x instanceof javax.xml.rpc.encoding.SerializerFactory) { - org.apache.axis.encoding.SerializerFactory sf = (org.apache.axis.encoding.SerializerFactory) - cachedSerFactories.get(i); - org.apache.axis.encoding.DeserializerFactory df = (org.apache.axis.encoding.DeserializerFactory) - cachedDeserFactories.get(i); - _call.registerTypeMapping(cls, qName, sf, df, false); - } - } - } - } - return _call; - } - catch (Throwable _t) { - throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t); - } - } - - public RemoteComment getComment(String in0, long in1) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[0]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getComment")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, new Long(in1)}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteComment) _resp; - } catch (Exception _exception) { - return (RemoteComment) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteComment.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteGroup createGroup(String in0, String in1, - RemoteUser in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[1]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "createGroup")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteGroup) _resp; - } catch (Exception _exception) { - return (RemoteGroup) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteGroup.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteSecurityLevel getSecurityLevel(String in0, - String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[2]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getSecurityLevel")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteSecurityLevel) _resp; - } catch (Exception _exception) { - return (RemoteSecurityLevel) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteSecurityLevel.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteServerInfo getServerInfo(String in0) - throws java.rmi.RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[3]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getServerInfo")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteServerInfo) _resp; - } catch (Exception _exception) { - return (RemoteServerInfo) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteServerInfo.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - throw axisFaultException; - } - } - - public RemoteGroup getGroup(String in0, String in1) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[4]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getGroup")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteGroup) _resp; - } catch (Exception _exception) { - return (RemoteGroup) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteGroup.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteUser createUser(String in0, String in1, - String in2, String in3, String in4) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[5]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "createUser")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2, in3, in4}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteUser) _resp; - } catch (Exception _exception) { - return (RemoteUser) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteUser.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteUser getUser(String in0, String in1) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[6]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getUser")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteUser) _resp; - } catch (Exception _exception) { - return (RemoteUser) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteUser.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public String login(String in0, String in1) throws java.rmi.RemoteException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[7]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "login")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (String) _resp; - } catch (Exception _exception) { - return (String) org.apache.axis.utils.JavaUtils.convert(_resp, String.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteIssue getIssue(String in0, String in1) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[8]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getIssue")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteIssue) _resp; - } catch (Exception _exception) { - return (RemoteIssue) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteIssue.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteIssue createIssue(String in0, - RemoteIssue in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[9]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "createIssue")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteIssue) _resp; - } catch (Exception _exception) { - return (RemoteIssue) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteIssue.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteNamedObject[] getAvailableActions(String in0, - String in1) throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[10]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getAvailableActions")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteNamedObject[]) _resp; - } catch (Exception _exception) { - return (RemoteNamedObject[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteNamedObject[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteIssue updateIssue(String in0, String in1, - RemoteFieldValue[] in2) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[11]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "updateIssue")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteIssue) _resp; - } catch (Exception _exception) { - return (RemoteIssue) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteIssue.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteConfiguration getConfiguration(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[12]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getConfiguration")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteConfiguration) _resp; - } catch (Exception _exception) { - return (RemoteConfiguration) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteConfiguration.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteComponent[] getComponents(String in0, - String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[13]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getComponents")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteComponent[]) _resp; - } catch (Exception _exception) { - return (RemoteComponent[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteComponent[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteProject updateProject(String in0, - RemoteProject in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[14]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "updateProject")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteProject) _resp; - } catch (Exception _exception) { - return (RemoteProject) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteProject.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteProject getProjectByKey(String in0, String in1) - throws java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[15]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getProjectByKey")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteProject) _resp; - } catch (Exception _exception) { - return (RemoteProject) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteProject.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemotePriority[] getPriorities(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[16]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getPriorities")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemotePriority[]) _resp; - } catch (Exception _exception) { - return (RemotePriority[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemotePriority[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteResolution[] getResolutions(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[17]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getResolutions")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteResolution[]) _resp; - } catch (Exception _exception) { - return (RemoteResolution[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteResolution[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteIssueType[] getIssueTypes(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[18]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getIssueTypes")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteIssueType[]) _resp; - } catch (Exception _exception) { - return (RemoteIssueType[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteIssueType[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteStatus[] getStatuses(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[19]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getStatuses")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteStatus[]) _resp; - } catch (Exception _exception) { - return (RemoteStatus[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteStatus[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteIssueType[] getSubTaskIssueTypes(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[20]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getSubTaskIssueTypes")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteIssueType[]) _resp; - } catch (Exception _exception) { - return (RemoteIssueType[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteIssueType[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteProjectRole[] getProjectRoles(String in0) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[21]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getProjectRoles")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteProjectRole[]) _resp; - } catch (Exception _exception) { - return (RemoteProjectRole[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteProjectRole[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteProjectRole getProjectRole(String in0, long in1) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[22]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getProjectRole")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, new Long(in1)}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteProjectRole) _resp; - } catch (Exception _exception) { - return (RemoteProjectRole) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteProjectRole.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteProjectRoleActors getProjectRoleActors(String in0, - RemoteProjectRole in1, - RemoteProject in2) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[23]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getProjectRoleActors")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteProjectRoleActors) _resp; - } catch (Exception _exception) { - return (RemoteProjectRoleActors) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteProjectRoleActors.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteRoleActors getDefaultRoleActors(String in0, - RemoteProjectRole in1) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[24]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getDefaultRoleActors")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteRoleActors) _resp; - } catch (Exception _exception) { - return (RemoteRoleActors) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteRoleActors.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void removeAllRoleActorsByNameAndType(String in0, String in1, String in2) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[25]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "removeAllRoleActorsByNameAndType")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void removeAllRoleActorsByProject(String in0, RemoteProject in1) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[26]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "removeAllRoleActorsByProject")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void deleteProjectRole(String in0, RemoteProjectRole in1, - boolean in2) throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[27]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "deleteProjectRole")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, new Boolean(in2)}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void updateProjectRole(String in0, RemoteProjectRole in1) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[28]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "updateProjectRole")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteProjectRole createProjectRole(String in0, - RemoteProjectRole in1) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[29]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "createProjectRole")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteProjectRole) _resp; - } catch (Exception _exception) { - return (RemoteProjectRole) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteProjectRole.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public boolean isProjectRoleNameUnique(String in0, String in1) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[30]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "isProjectRoleNameUnique")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return ((Boolean) _resp).booleanValue(); - } catch (Exception _exception) { - return ((Boolean) org.apache.axis.utils.JavaUtils.convert(_resp, boolean.class)).booleanValue(); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void addActorsToProjectRole(String in0, String[] in1, - RemoteProjectRole in2, - RemoteProject in3, String in4) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[31]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "addActorsToProjectRole")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2, in3, in4}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void removeActorsFromProjectRole(String in0, String[] in1, - RemoteProjectRole in2, - RemoteProject in3, String in4) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[32]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "removeActorsFromProjectRole")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2, in3, in4}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void addDefaultActorsToProjectRole(String in0, String[] in1, - RemoteProjectRole in2, String in3) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[33]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "addDefaultActorsToProjectRole")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2, in3}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void removeDefaultActorsFromProjectRole(String in0, String[] in1, - RemoteProjectRole in2, String in3) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[34]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "removeDefaultActorsFromProjectRole")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2, in3}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteScheme[] getAssociatedNotificationSchemes(String in0, - RemoteProjectRole in1) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[35]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getAssociatedNotificationSchemes")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteScheme[]) _resp; - } catch (Exception _exception) { - return (RemoteScheme[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteScheme[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteScheme[] getAssociatedPermissionSchemes(String in0, - RemoteProjectRole in1) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[36]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getAssociatedPermissionSchemes")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteScheme[]) _resp; - } catch (Exception _exception) { - return (RemoteScheme[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteScheme[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteField[] getCustomFields(String in0) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[37]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getCustomFields")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteField[]) _resp; - } catch (Exception _exception) { - return (RemoteField[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteField[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteComment[] getComments(String in0, String in1) - throws java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[38]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getComments")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteComment[]) _resp; - } catch (Exception _exception) { - return (RemoteComment[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteComment[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteFilter[] getFavouriteFilters(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[39]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getFavouriteFilters")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteFilter[]) _resp; - } catch (Exception _exception) { - return (RemoteFilter[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteFilter[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void archiveVersion(String in0, String in1, String in2, boolean in3) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[40]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "archiveVersion")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2, new Boolean(in3)}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteVersion[] getVersions(String in0, String in1) - throws java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[41]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getVersions")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteVersion[]) _resp; - } catch (Exception _exception) { - return (RemoteVersion[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteVersion[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteProject createProject(String in0, String in1, - String in2, String in3, String in4, String in5, - RemotePermissionScheme in6, - RemoteScheme in7, - RemoteScheme in8) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[42]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "createProject")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2, in3, in4, in5, in6, in7, in8}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteProject) _resp; - } catch (Exception _exception) { - return (RemoteProject) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteProject.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void addComment(String in0, String in1, - RemoteComment in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[43]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "addComment")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteField[] getFieldsForEdit(String in0, String in1) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[44]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getFieldsForEdit")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteField[]) _resp; - } catch (Exception _exception) { - return (RemoteField[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteField[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteIssueType[] getIssueTypesForProject(String in0, - String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteAuthenticationException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[45]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getIssueTypesForProject")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteIssueType[]) _resp; - } catch (Exception _exception) { - return (RemoteIssueType[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteIssueType[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteIssueType[] getSubTaskIssueTypesForProject(String in0, - String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteAuthenticationException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[46]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getSubTaskIssueTypesForProject")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteIssueType[]) _resp; - } catch (Exception _exception) { - return (RemoteIssueType[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteIssueType[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void addUserToGroup(String in0, RemoteGroup in1, - RemoteUser in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[47]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "addUserToGroup")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void removeUserFromGroup(String in0, RemoteGroup in1, - RemoteUser in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[48]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "removeUserFromGroup")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public boolean logout(String in0) throws java.rmi.RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[49]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "logout")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return ((Boolean) _resp).booleanValue(); - } catch (Exception _exception) { - return ((Boolean) org.apache.axis.utils.JavaUtils.convert(_resp, boolean.class)).booleanValue(); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - throw axisFaultException; - } - } - - public RemoteProject getProjectById(String in0, long in1) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[50]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getProjectById")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, new Long(in1)}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteProject) _resp; - } catch (Exception _exception) { - return (RemoteProject) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteProject.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteProject getProjectWithSchemesById(String in0, long in1) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[51]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getProjectWithSchemesById")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, new Long(in1)}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteProject) _resp; - } catch (Exception _exception) { - return (RemoteProject) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteProject.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void deleteProject(String in0, String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[52]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "deleteProject")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void releaseVersion(String in0, String in1, - RemoteVersion in2) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[53]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "releaseVersion")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteSecurityLevel[] getSecurityLevels(String in0, - String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[54]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getSecurityLevels")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteSecurityLevel[]) _resp; - } catch (Exception _exception) { - return (RemoteSecurityLevel[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteSecurityLevel[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void deleteIssue(String in0, String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[55]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "deleteIssue")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteIssue createIssueWithSecurityLevel(String in0, - RemoteIssue in1, long in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[56]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "createIssueWithSecurityLevel")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, new Long(in2)}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteIssue) _resp; - } catch (Exception _exception) { - return (RemoteIssue) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteIssue.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public boolean addAttachmentsToIssue(String in0, String in1, String[] in2, byte[][] in3) - throws java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[57]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "addAttachmentsToIssue")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2, in3}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return ((Boolean) _resp).booleanValue(); - } catch (Exception _exception) { - return ((Boolean) org.apache.axis.utils.JavaUtils.convert(_resp, boolean.class)).booleanValue(); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteAttachment[] getAttachmentsFromIssue(String in0, - String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[58]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getAttachmentsFromIssue")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteAttachment[]) _resp; - } catch (ClassCastException e) { - throw e; // see PL-1918 for further information why this manual modification is needed here - } catch (Exception _exception) { - return (RemoteAttachment[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteAttachment[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public boolean hasPermissionToEditComment(String in0, - RemoteComment in1) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[59]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "hasPermissionToEditComment")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return ((Boolean) _resp).booleanValue(); - } catch (Exception _exception) { - return ((Boolean) org.apache.axis.utils.JavaUtils.convert(_resp, boolean.class)).booleanValue(); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteComment editComment(String in0, - RemoteComment in1) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[60]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "editComment")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteComment) _resp; - } catch (Exception _exception) { - return (RemoteComment) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteComment.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteField[] getFieldsForAction(String in0, - String in1, String in2) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[61]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getFieldsForAction")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteField[]) _resp; - } catch (Exception _exception) { - return (RemoteField[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteField[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteIssue progressWorkflowAction(String in0, - String in1, String in2, RemoteFieldValue[] in3) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[62]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "progressWorkflowAction")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2, in3}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteIssue) _resp; - } catch (Exception _exception) { - return (RemoteIssue) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteIssue.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteIssue getIssueById(String in0, String in1) - throws java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[63]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getIssueById")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteIssue) _resp; - } catch (Exception _exception) { - return (RemoteIssue) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteIssue.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteWorklog addWorklogWithNewRemainingEstimate(String in0, - String in1, RemoteWorklog in2, String in3) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[64]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "addWorklogWithNewRemainingEstimate")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2, in3}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteWorklog) _resp; - } catch (Exception _exception) { - return (RemoteWorklog) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteWorklog.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteWorklog addWorklogAndAutoAdjustRemainingEstimate( - String in0, String in1, RemoteWorklog in2) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[65]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", - "addWorklogAndAutoAdjustRemainingEstimate")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteWorklog) _resp; - } catch (Exception _exception) { - return (RemoteWorklog) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteWorklog.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteWorklog addWorklogAndRetainRemainingEstimate(String in0, - String in1, RemoteWorklog in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[66]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "addWorklogAndRetainRemainingEstimate")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteWorklog) _resp; - } catch (Exception _exception) { - return (RemoteWorklog) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteWorklog.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void deleteWorklogWithNewRemainingEstimate(String in0, String in1, String in2) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[67]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "deleteWorklogWithNewRemainingEstimate")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void deleteWorklogAndAutoAdjustRemainingEstimate(String in0, String in1) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[68]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", - "deleteWorklogAndAutoAdjustRemainingEstimate")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void deleteWorklogAndRetainRemainingEstimate(String in0, String in1) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[69]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "deleteWorklogAndRetainRemainingEstimate")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void updateWorklogWithNewRemainingEstimate(String in0, - RemoteWorklog in1, String in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[70]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "updateWorklogWithNewRemainingEstimate")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void updateWorklogAndAutoAdjustRemainingEstimate(String in0, - RemoteWorklog in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[71]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", - "updateWorklogAndAutoAdjustRemainingEstimate")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void updateWorklogAndRetainRemainingEstimate(String in0, - RemoteWorklog in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[72]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "updateWorklogAndRetainRemainingEstimate")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteWorklog[] getWorklogs(String in0, String in1) - throws java.rmi.RemoteException, RemotePermissionException, - RemoteValidationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[73]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getWorklogs")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteWorklog[]) _resp; - } catch (Exception _exception) { - return (RemoteWorklog[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteWorklog[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public boolean hasPermissionToCreateWorklog(String in0, String in1) throws java.rmi.RemoteException, - RemoteValidationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[74]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "hasPermissionToCreateWorklog")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return ((Boolean) _resp).booleanValue(); - } catch (Exception _exception) { - return ((Boolean) org.apache.axis.utils.JavaUtils.convert(_resp, boolean.class)).booleanValue(); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public boolean hasPermissionToDeleteWorklog(String in0, String in1) throws java.rmi.RemoteException, - RemoteValidationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[75]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "hasPermissionToDeleteWorklog")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return ((Boolean) _resp).booleanValue(); - } catch (Exception _exception) { - return ((Boolean) org.apache.axis.utils.JavaUtils.convert(_resp, boolean.class)).booleanValue(); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public boolean hasPermissionToUpdateWorklog(String in0, String in1) throws java.rmi.RemoteException, - RemoteValidationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[76]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "hasPermissionToUpdateWorklog")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return ((Boolean) _resp).booleanValue(); - } catch (Exception _exception) { - return ((Boolean) org.apache.axis.utils.JavaUtils.convert(_resp, boolean.class)).booleanValue(); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteScheme[] getNotificationSchemes(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[77]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getNotificationSchemes")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteScheme[]) _resp; - } catch (Exception _exception) { - return (RemoteScheme[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteScheme[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemotePermissionScheme[] getPermissionSchemes(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[78]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getPermissionSchemes")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemotePermissionScheme[]) _resp; - } catch (Exception _exception) { - return (RemotePermissionScheme[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemotePermissionScheme[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemotePermissionScheme createPermissionScheme(String in0, - String in1, String in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[79]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "createPermissionScheme")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemotePermissionScheme) _resp; - } catch (Exception _exception) { - return (RemotePermissionScheme) org.apache.axis.utils.JavaUtils - .convert(_resp, RemotePermissionScheme.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void deletePermissionScheme(String in0, String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[80]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "deletePermissionScheme")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemotePermissionScheme addPermissionTo(String in0, - RemotePermissionScheme in1, - RemotePermission in2, - RemoteEntity in3) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[81]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "addPermissionTo")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2, in3}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemotePermissionScheme) _resp; - } catch (Exception _exception) { - return (RemotePermissionScheme) org.apache.axis.utils.JavaUtils - .convert(_resp, RemotePermissionScheme.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemotePermissionScheme deletePermissionFrom(String in0, - RemotePermissionScheme in1, - RemotePermission in2, - RemoteEntity in3) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[82]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "deletePermissionFrom")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2, in3}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemotePermissionScheme) _resp; - } catch (Exception _exception) { - return (RemotePermissionScheme) org.apache.axis.utils.JavaUtils - .convert(_resp, RemotePermissionScheme.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemotePermission[] getAllPermissions(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[83]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getAllPermissions")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemotePermission[]) _resp; - } catch (Exception _exception) { - return (RemotePermission[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemotePermission[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public long getIssueCountForFilter(String in0, String in1) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[84]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getIssueCountForFilter")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return ((Long) _resp).longValue(); - } catch (Exception _exception) { - return ((Long) org.apache.axis.utils.JavaUtils.convert(_resp, long.class)).longValue(); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteIssue[] getIssuesFromTextSearch(String in0, - String in1) throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[85]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getIssuesFromTextSearch")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteIssue[]) _resp; - } catch (Exception _exception) { - return (RemoteIssue[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteIssue[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteIssue[] getIssuesFromTextSearchWithProject(String in0, - String[] in1, String in2, int in3) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[86]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getIssuesFromTextSearchWithProject")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2, new Integer(in3)}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteIssue[]) _resp; - } catch (Exception _exception) { - return (RemoteIssue[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteIssue[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void deleteUser(String in0, String in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[87]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "deleteUser")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteGroup updateGroup(String in0, - RemoteGroup in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[88]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "updateGroup")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteGroup) _resp; - } catch (Exception _exception) { - return (RemoteGroup) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteGroup.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void deleteGroup(String in0, String in1, String in2) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[89]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "deleteGroup")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public void refreshCustomFields(String in0) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[90]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "refreshCustomFields")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } - extractAttachments(_call); - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteProject[] getProjectsNoSchemes(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[91]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getProjectsNoSchemes")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteProject[]) _resp; - } catch (Exception _exception) { - return (RemoteProject[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteProject[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteVersion addVersion(String in0, String in1, - RemoteVersion in2) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[92]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "addVersion")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteVersion) _resp; - } catch (Exception _exception) { - return (RemoteVersion) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteVersion.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteFilter[] getSavedFilters(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[93]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getSavedFilters")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteFilter[]) _resp; - } catch (Exception _exception) { - return (RemoteFilter[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteFilter[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public boolean addBase64EncodedAttachmentsToIssue(String in0, String in1, String[] in2, - String[] in3) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[94]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "addBase64EncodedAttachmentsToIssue")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1, in2, in3}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return ((Boolean) _resp).booleanValue(); - } catch (Exception _exception) { - return ((Boolean) org.apache.axis.utils.JavaUtils.convert(_resp, boolean.class)).booleanValue(); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteProject createProjectFromObject(String in0, - RemoteProject in1) throws java.rmi.RemoteException, - RemotePermissionException, - RemoteValidationException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[95]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "createProjectFromObject")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteProject) _resp; - } catch (Exception _exception) { - return (RemoteProject) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteProject.class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteValidationException) { - throw (RemoteValidationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteScheme[] getSecuritySchemes(String in0) throws - java.rmi.RemoteException, RemotePermissionException, - RemoteAuthenticationException, - RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[96]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getSecuritySchemes")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteScheme[]) _resp; - } catch (Exception _exception) { - return (RemoteScheme[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteScheme[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemotePermissionException) { - throw (RemotePermissionException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteAuthenticationException) { - throw (RemoteAuthenticationException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteIssue[] getIssuesFromFilter(String in0, - String in1) throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[97]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getIssuesFromFilter")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call.invoke(new Object[]{in0, in1}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteIssue[]) _resp; - } catch (Exception _exception) { - return (RemoteIssue[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteIssue[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteIssue[] getIssuesFromFilterWithLimit(String in0, - String in1, int in2, int in3) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[98]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getIssuesFromFilterWithLimit")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call - .invoke(new Object[]{in0, in1, new Integer(in2), new Integer(in3)}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteIssue[]) _resp; - } catch (Exception _exception) { - return (RemoteIssue[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteIssue[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - - public RemoteIssue[] getIssuesFromTextSearchWithLimit(String in0, - String in1, int in2, int in3) - throws java.rmi.RemoteException, RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[99]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName( - new javax.xml.namespace.QName("http://soap.rpc.jira.atlassian.com", "getIssuesFromTextSearchWithLimit")); - - setRequestHeaders(_call); - setAttachments(_call); - try { - Object _resp = _call - .invoke(new Object[]{in0, in1, new Integer(in2), new Integer(in3)}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) _resp; - } else { - extractAttachments(_call); - try { - return (RemoteIssue[]) _resp; - } catch (Exception _exception) { - return (RemoteIssue[]) org.apache.axis.utils.JavaUtils - .convert(_resp, RemoteIssue[].class); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - if (axisFaultException.detail != null) { - if (axisFaultException.detail instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException) axisFaultException.detail; - } - if (axisFaultException.detail instanceof RemoteException) { - throw (RemoteException) axisFaultException.detail; - } - } - throw axisFaultException; - } - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteAttachment.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteAttachment.java deleted file mode 100644 index 08e1e3056726..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteAttachment.java +++ /dev/null @@ -1,275 +0,0 @@ -/** - * RemoteAttachment.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteAttachment extends AbstractRemoteEntity - implements java.io.Serializable { - private String author; - - private java.util.Calendar created; - - private String filename; - - private Long filesize; - - private String mimetype; - - public RemoteAttachment() { - } - - public RemoteAttachment( - String id, - String author, - java.util.Calendar created, - String filename, - Long filesize, - String mimetype) { - super( - id); - this.author = author; - this.created = created; - this.filename = filename; - this.filesize = filesize; - this.mimetype = mimetype; - } - - - /** - * Gets the author value for this RemoteAttachment. - * - * @return author - */ - public String getAuthor() { - return author; - } - - - /** - * Sets the author value for this RemoteAttachment. - * - * @param author - */ - public void setAuthor(String author) { - this.author = author; - } - - - /** - * Gets the created value for this RemoteAttachment. - * - * @return created - */ - public java.util.Calendar getCreated() { - return created; - } - - - /** - * Sets the created value for this RemoteAttachment. - * - * @param created - */ - public void setCreated(java.util.Calendar created) { - this.created = created; - } - - - /** - * Gets the filename value for this RemoteAttachment. - * - * @return filename - */ - public String getFilename() { - return filename; - } - - - /** - * Sets the filename value for this RemoteAttachment. - * - * @param filename - */ - public void setFilename(String filename) { - this.filename = filename; - } - - - /** - * Gets the filesize value for this RemoteAttachment. - * - * @return filesize - */ - public Long getFilesize() { - return filesize; - } - - - /** - * Sets the filesize value for this RemoteAttachment. - * - * @param filesize - */ - public void setFilesize(Long filesize) { - this.filesize = filesize; - } - - - /** - * Gets the mimetype value for this RemoteAttachment. - * - * @return mimetype - */ - public String getMimetype() { - return mimetype; - } - - - /** - * Sets the mimetype value for this RemoteAttachment. - * - * @param mimetype - */ - public void setMimetype(String mimetype) { - this.mimetype = mimetype; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteAttachment)) { - return false; - } - RemoteAttachment other = (RemoteAttachment) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj) && - ((this.author == null && other.getAuthor() == null) || - (this.author != null && - this.author.equals(other.getAuthor()))) && - ((this.created == null && other.getCreated() == null) || - (this.created != null && - this.created.equals(other.getCreated()))) && - ((this.filename == null && other.getFilename() == null) || - (this.filename != null && - this.filename.equals(other.getFilename()))) && - ((this.filesize == null && other.getFilesize() == null) || - (this.filesize != null && - this.filesize.equals(other.getFilesize()))) && - ((this.mimetype == null && other.getMimetype() == null) || - (this.mimetype != null && - this.mimetype.equals(other.getMimetype()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - if (getAuthor() != null) { - _hashCode += getAuthor().hashCode(); - } - if (getCreated() != null) { - _hashCode += getCreated().hashCode(); - } - if (getFilename() != null) { - _hashCode += getFilename().hashCode(); - } - if (getFilesize() != null) { - _hashCode += getFilesize().hashCode(); - } - if (getMimetype() != null) { - _hashCode += getMimetype().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteAttachment.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteAttachment")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("author"); - elemField.setXmlName(new javax.xml.namespace.QName("", "author")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("created"); - elemField.setXmlName(new javax.xml.namespace.QName("", "created")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "dateTime")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("filename"); - elemField.setXmlName(new javax.xml.namespace.QName("", "filename")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("filesize"); - elemField.setXmlName(new javax.xml.namespace.QName("", "filesize")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("mimetype"); - elemField.setXmlName(new javax.xml.namespace.QName("", "mimetype")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteAuthenticationException.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteAuthenticationException.java deleted file mode 100644 index 0436e949c890..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteAuthenticationException.java +++ /dev/null @@ -1,98 +0,0 @@ -/** - * RemoteAuthenticationException.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteAuthenticationException extends RemoteException - implements java.io.Serializable { - public RemoteAuthenticationException() { - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteAuthenticationException)) { - return false; - } - RemoteAuthenticationException other = (RemoteAuthenticationException) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteAuthenticationException.class, true); - - static { - typeDesc.setXmlType( - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteAuthenticationException")); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - - - /** - * Writes the exception data to the faultDetails - */ - public void writeDetails(javax.xml.namespace.QName qname, org.apache.axis.encoding.SerializationContext context) - throws java.io.IOException { - context.serialize(qname, null, this); - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteComment.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteComment.java deleted file mode 100644 index f18f6c462917..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteComment.java +++ /dev/null @@ -1,379 +0,0 @@ -/** - * RemoteComment.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteComment implements java.io.Serializable { - private String author; - - private String body; - - private java.util.Calendar created; - - private String groupLevel; - - private String id; - - private String roleLevel; - - private String updateAuthor; - - private java.util.Calendar updated; - - public RemoteComment() { - } - - public RemoteComment( - String author, - String body, - java.util.Calendar created, - String groupLevel, - String id, - String roleLevel, - String updateAuthor, - java.util.Calendar updated) { - this.author = author; - this.body = body; - this.created = created; - this.groupLevel = groupLevel; - this.id = id; - this.roleLevel = roleLevel; - this.updateAuthor = updateAuthor; - this.updated = updated; - } - - - /** - * Gets the author value for this RemoteComment. - * - * @return author - */ - public String getAuthor() { - return author; - } - - - /** - * Sets the author value for this RemoteComment. - * - * @param author - */ - public void setAuthor(String author) { - this.author = author; - } - - - /** - * Gets the body value for this RemoteComment. - * - * @return body - */ - public String getBody() { - return body; - } - - - /** - * Sets the body value for this RemoteComment. - * - * @param body - */ - public void setBody(String body) { - this.body = body; - } - - - /** - * Gets the created value for this RemoteComment. - * - * @return created - */ - public java.util.Calendar getCreated() { - return created; - } - - - /** - * Sets the created value for this RemoteComment. - * - * @param created - */ - public void setCreated(java.util.Calendar created) { - this.created = created; - } - - - /** - * Gets the groupLevel value for this RemoteComment. - * - * @return groupLevel - */ - public String getGroupLevel() { - return groupLevel; - } - - - /** - * Sets the groupLevel value for this RemoteComment. - * - * @param groupLevel - */ - public void setGroupLevel(String groupLevel) { - this.groupLevel = groupLevel; - } - - - /** - * Gets the id value for this RemoteComment. - * - * @return id - */ - public String getId() { - return id; - } - - - /** - * Sets the id value for this RemoteComment. - * - * @param id - */ - public void setId(String id) { - this.id = id; - } - - - /** - * Gets the roleLevel value for this RemoteComment. - * - * @return roleLevel - */ - public String getRoleLevel() { - return roleLevel; - } - - - /** - * Sets the roleLevel value for this RemoteComment. - * - * @param roleLevel - */ - public void setRoleLevel(String roleLevel) { - this.roleLevel = roleLevel; - } - - - /** - * Gets the updateAuthor value for this RemoteComment. - * - * @return updateAuthor - */ - public String getUpdateAuthor() { - return updateAuthor; - } - - - /** - * Sets the updateAuthor value for this RemoteComment. - * - * @param updateAuthor - */ - public void setUpdateAuthor(String updateAuthor) { - this.updateAuthor = updateAuthor; - } - - - /** - * Gets the updated value for this RemoteComment. - * - * @return updated - */ - public java.util.Calendar getUpdated() { - return updated; - } - - - /** - * Sets the updated value for this RemoteComment. - * - * @param updated - */ - public void setUpdated(java.util.Calendar updated) { - this.updated = updated; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteComment)) { - return false; - } - RemoteComment other = (RemoteComment) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - ((this.author == null && other.getAuthor() == null) || - (this.author != null && - this.author.equals(other.getAuthor()))) && - ((this.body == null && other.getBody() == null) || - (this.body != null && - this.body.equals(other.getBody()))) && - ((this.created == null && other.getCreated() == null) || - (this.created != null && - this.created.equals(other.getCreated()))) && - ((this.groupLevel == null && other.getGroupLevel() == null) || - (this.groupLevel != null && - this.groupLevel.equals(other.getGroupLevel()))) && - ((this.id == null && other.getId() == null) || - (this.id != null && - this.id.equals(other.getId()))) && - ((this.roleLevel == null && other.getRoleLevel() == null) || - (this.roleLevel != null && - this.roleLevel.equals(other.getRoleLevel()))) && - ((this.updateAuthor == null && other.getUpdateAuthor() == null) || - (this.updateAuthor != null && - this.updateAuthor.equals(other.getUpdateAuthor()))) && - ((this.updated == null && other.getUpdated() == null) || - (this.updated != null && - this.updated.equals(other.getUpdated()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - if (getAuthor() != null) { - _hashCode += getAuthor().hashCode(); - } - if (getBody() != null) { - _hashCode += getBody().hashCode(); - } - if (getCreated() != null) { - _hashCode += getCreated().hashCode(); - } - if (getGroupLevel() != null) { - _hashCode += getGroupLevel().hashCode(); - } - if (getId() != null) { - _hashCode += getId().hashCode(); - } - if (getRoleLevel() != null) { - _hashCode += getRoleLevel().hashCode(); - } - if (getUpdateAuthor() != null) { - _hashCode += getUpdateAuthor().hashCode(); - } - if (getUpdated() != null) { - _hashCode += getUpdated().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteComment.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteComment")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("author"); - elemField.setXmlName(new javax.xml.namespace.QName("", "author")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("body"); - elemField.setXmlName(new javax.xml.namespace.QName("", "body")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("created"); - elemField.setXmlName(new javax.xml.namespace.QName("", "created")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "dateTime")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("groupLevel"); - elemField.setXmlName(new javax.xml.namespace.QName("", "groupLevel")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("id"); - elemField.setXmlName(new javax.xml.namespace.QName("", "id")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("roleLevel"); - elemField.setXmlName(new javax.xml.namespace.QName("", "roleLevel")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("updateAuthor"); - elemField.setXmlName(new javax.xml.namespace.QName("", "updateAuthor")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("updated"); - elemField.setXmlName(new javax.xml.namespace.QName("", "updated")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "dateTime")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteComponent.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteComponent.java deleted file mode 100644 index 96a8595474d5..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteComponent.java +++ /dev/null @@ -1,97 +0,0 @@ -/** - * RemoteComponent.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteComponent extends AbstractNamedRemoteEntity - implements java.io.Serializable { - public RemoteComponent() { - } - - public RemoteComponent( - String id, - String name) { - super( - id, - name); - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteComponent)) { - return false; - } - RemoteComponent other = (RemoteComponent) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteComponent.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteComponent")); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteConfiguration.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteConfiguration.java deleted file mode 100644 index 2272318e8f8e..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteConfiguration.java +++ /dev/null @@ -1,411 +0,0 @@ -/** - * RemoteConfiguration.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteConfiguration implements java.io.Serializable { - private boolean allowAttachments; - - private boolean allowExternalUserManagment; - - private boolean allowIssueLinking; - - private boolean allowSubTasks; - - private boolean allowTimeTracking; - - private boolean allowUnassignedIssues; - - private boolean allowVoting; - - private boolean allowWatching; - - private int timeTrackingDaysPerWeek; - - private int timeTrackingHoursPerDay; - - public RemoteConfiguration() { - } - - public RemoteConfiguration( - boolean allowAttachments, - boolean allowExternalUserManagment, - boolean allowIssueLinking, - boolean allowSubTasks, - boolean allowTimeTracking, - boolean allowUnassignedIssues, - boolean allowVoting, - boolean allowWatching, - int timeTrackingDaysPerWeek, - int timeTrackingHoursPerDay) { - this.allowAttachments = allowAttachments; - this.allowExternalUserManagment = allowExternalUserManagment; - this.allowIssueLinking = allowIssueLinking; - this.allowSubTasks = allowSubTasks; - this.allowTimeTracking = allowTimeTracking; - this.allowUnassignedIssues = allowUnassignedIssues; - this.allowVoting = allowVoting; - this.allowWatching = allowWatching; - this.timeTrackingDaysPerWeek = timeTrackingDaysPerWeek; - this.timeTrackingHoursPerDay = timeTrackingHoursPerDay; - } - - - /** - * Gets the allowAttachments value for this RemoteConfiguration. - * - * @return allowAttachments - */ - public boolean isAllowAttachments() { - return allowAttachments; - } - - - /** - * Sets the allowAttachments value for this RemoteConfiguration. - * - * @param allowAttachments - */ - public void setAllowAttachments(boolean allowAttachments) { - this.allowAttachments = allowAttachments; - } - - - /** - * Gets the allowExternalUserManagment value for this RemoteConfiguration. - * - * @return allowExternalUserManagment - */ - public boolean isAllowExternalUserManagment() { - return allowExternalUserManagment; - } - - - /** - * Sets the allowExternalUserManagment value for this RemoteConfiguration. - * - * @param allowExternalUserManagment - */ - public void setAllowExternalUserManagment(boolean allowExternalUserManagment) { - this.allowExternalUserManagment = allowExternalUserManagment; - } - - - /** - * Gets the allowIssueLinking value for this RemoteConfiguration. - * - * @return allowIssueLinking - */ - public boolean isAllowIssueLinking() { - return allowIssueLinking; - } - - - /** - * Sets the allowIssueLinking value for this RemoteConfiguration. - * - * @param allowIssueLinking - */ - public void setAllowIssueLinking(boolean allowIssueLinking) { - this.allowIssueLinking = allowIssueLinking; - } - - - /** - * Gets the allowSubTasks value for this RemoteConfiguration. - * - * @return allowSubTasks - */ - public boolean isAllowSubTasks() { - return allowSubTasks; - } - - - /** - * Sets the allowSubTasks value for this RemoteConfiguration. - * - * @param allowSubTasks - */ - public void setAllowSubTasks(boolean allowSubTasks) { - this.allowSubTasks = allowSubTasks; - } - - - /** - * Gets the allowTimeTracking value for this RemoteConfiguration. - * - * @return allowTimeTracking - */ - public boolean isAllowTimeTracking() { - return allowTimeTracking; - } - - - /** - * Sets the allowTimeTracking value for this RemoteConfiguration. - * - * @param allowTimeTracking - */ - public void setAllowTimeTracking(boolean allowTimeTracking) { - this.allowTimeTracking = allowTimeTracking; - } - - - /** - * Gets the allowUnassignedIssues value for this RemoteConfiguration. - * - * @return allowUnassignedIssues - */ - public boolean isAllowUnassignedIssues() { - return allowUnassignedIssues; - } - - - /** - * Sets the allowUnassignedIssues value for this RemoteConfiguration. - * - * @param allowUnassignedIssues - */ - public void setAllowUnassignedIssues(boolean allowUnassignedIssues) { - this.allowUnassignedIssues = allowUnassignedIssues; - } - - - /** - * Gets the allowVoting value for this RemoteConfiguration. - * - * @return allowVoting - */ - public boolean isAllowVoting() { - return allowVoting; - } - - - /** - * Sets the allowVoting value for this RemoteConfiguration. - * - * @param allowVoting - */ - public void setAllowVoting(boolean allowVoting) { - this.allowVoting = allowVoting; - } - - - /** - * Gets the allowWatching value for this RemoteConfiguration. - * - * @return allowWatching - */ - public boolean isAllowWatching() { - return allowWatching; - } - - - /** - * Sets the allowWatching value for this RemoteConfiguration. - * - * @param allowWatching - */ - public void setAllowWatching(boolean allowWatching) { - this.allowWatching = allowWatching; - } - - - /** - * Gets the timeTrackingDaysPerWeek value for this RemoteConfiguration. - * - * @return timeTrackingDaysPerWeek - */ - public int getTimeTrackingDaysPerWeek() { - return timeTrackingDaysPerWeek; - } - - - /** - * Sets the timeTrackingDaysPerWeek value for this RemoteConfiguration. - * - * @param timeTrackingDaysPerWeek - */ - public void setTimeTrackingDaysPerWeek(int timeTrackingDaysPerWeek) { - this.timeTrackingDaysPerWeek = timeTrackingDaysPerWeek; - } - - - /** - * Gets the timeTrackingHoursPerDay value for this RemoteConfiguration. - * - * @return timeTrackingHoursPerDay - */ - public int getTimeTrackingHoursPerDay() { - return timeTrackingHoursPerDay; - } - - - /** - * Sets the timeTrackingHoursPerDay value for this RemoteConfiguration. - * - * @param timeTrackingHoursPerDay - */ - public void setTimeTrackingHoursPerDay(int timeTrackingHoursPerDay) { - this.timeTrackingHoursPerDay = timeTrackingHoursPerDay; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteConfiguration)) { - return false; - } - RemoteConfiguration other = (RemoteConfiguration) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - this.allowAttachments == other.isAllowAttachments() && - this.allowExternalUserManagment == other.isAllowExternalUserManagment() && - this.allowIssueLinking == other.isAllowIssueLinking() && - this.allowSubTasks == other.isAllowSubTasks() && - this.allowTimeTracking == other.isAllowTimeTracking() && - this.allowUnassignedIssues == other.isAllowUnassignedIssues() && - this.allowVoting == other.isAllowVoting() && - this.allowWatching == other.isAllowWatching() && - this.timeTrackingDaysPerWeek == other.getTimeTrackingDaysPerWeek() && - this.timeTrackingHoursPerDay == other.getTimeTrackingHoursPerDay(); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - _hashCode += (isAllowAttachments() ? Boolean.TRUE : Boolean.FALSE).hashCode(); - _hashCode += (isAllowExternalUserManagment() ? Boolean.TRUE : Boolean.FALSE).hashCode(); - _hashCode += (isAllowIssueLinking() ? Boolean.TRUE : Boolean.FALSE).hashCode(); - _hashCode += (isAllowSubTasks() ? Boolean.TRUE : Boolean.FALSE).hashCode(); - _hashCode += (isAllowTimeTracking() ? Boolean.TRUE : Boolean.FALSE).hashCode(); - _hashCode += (isAllowUnassignedIssues() ? Boolean.TRUE : Boolean.FALSE).hashCode(); - _hashCode += (isAllowVoting() ? Boolean.TRUE : Boolean.FALSE).hashCode(); - _hashCode += (isAllowWatching() ? Boolean.TRUE : Boolean.FALSE).hashCode(); - _hashCode += getTimeTrackingDaysPerWeek(); - _hashCode += getTimeTrackingHoursPerDay(); - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteConfiguration.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteConfiguration")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("allowAttachments"); - elemField.setXmlName(new javax.xml.namespace.QName("", "allowAttachments")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("allowExternalUserManagment"); - elemField.setXmlName(new javax.xml.namespace.QName("", "allowExternalUserManagment")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("allowIssueLinking"); - elemField.setXmlName(new javax.xml.namespace.QName("", "allowIssueLinking")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("allowSubTasks"); - elemField.setXmlName(new javax.xml.namespace.QName("", "allowSubTasks")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("allowTimeTracking"); - elemField.setXmlName(new javax.xml.namespace.QName("", "allowTimeTracking")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("allowUnassignedIssues"); - elemField.setXmlName(new javax.xml.namespace.QName("", "allowUnassignedIssues")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("allowVoting"); - elemField.setXmlName(new javax.xml.namespace.QName("", "allowVoting")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("allowWatching"); - elemField.setXmlName(new javax.xml.namespace.QName("", "allowWatching")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("timeTrackingDaysPerWeek"); - elemField.setXmlName(new javax.xml.namespace.QName("", "timeTrackingDaysPerWeek")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("timeTrackingHoursPerDay"); - elemField.setXmlName(new javax.xml.namespace.QName("", "timeTrackingHoursPerDay")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteCustomFieldValue.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteCustomFieldValue.java deleted file mode 100644 index 5ee9e2032d51..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteCustomFieldValue.java +++ /dev/null @@ -1,208 +0,0 @@ -/** - * RemoteCustomFieldValue.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteCustomFieldValue implements java.io.Serializable { - private String customfieldId; - - private String key; - - private String[] values; - - public RemoteCustomFieldValue() { - } - - public RemoteCustomFieldValue( - String customfieldId, - String key, - String[] values) { - this.customfieldId = customfieldId; - this.key = key; - this.values = values; - } - - - /** - * Gets the customfieldId value for this RemoteCustomFieldValue. - * - * @return customfieldId - */ - public String getCustomfieldId() { - return customfieldId; - } - - - /** - * Sets the customfieldId value for this RemoteCustomFieldValue. - * - * @param customfieldId - */ - public void setCustomfieldId(String customfieldId) { - this.customfieldId = customfieldId; - } - - - /** - * Gets the key value for this RemoteCustomFieldValue. - * - * @return key - */ - public String getKey() { - return key; - } - - - /** - * Sets the key value for this RemoteCustomFieldValue. - * - * @param key - */ - public void setKey(String key) { - this.key = key; - } - - - /** - * Gets the values value for this RemoteCustomFieldValue. - * - * @return values - */ - public String[] getValues() { - return values; - } - - - /** - * Sets the values value for this RemoteCustomFieldValue. - * - * @param values - */ - public void setValues(String[] values) { - this.values = values; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteCustomFieldValue)) { - return false; - } - RemoteCustomFieldValue other = (RemoteCustomFieldValue) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - ((this.customfieldId == null && other.getCustomfieldId() == null) || - (this.customfieldId != null && - this.customfieldId.equals(other.getCustomfieldId()))) && - ((this.key == null && other.getKey() == null) || - (this.key != null && - this.key.equals(other.getKey()))) && - ((this.values == null && other.getValues() == null) || - (this.values != null && - java.util.Arrays.equals(this.values, other.getValues()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - if (getCustomfieldId() != null) { - _hashCode += getCustomfieldId().hashCode(); - } - if (getKey() != null) { - _hashCode += getKey().hashCode(); - } - if (getValues() != null) { - for (int i = 0; - i < java.lang.reflect.Array.getLength(getValues()); - i++) { - Object obj = java.lang.reflect.Array.get(getValues(), i); - if (obj != null && - !obj.getClass().isArray()) { - _hashCode += obj.hashCode(); - } - } - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteCustomFieldValue.class, true); - - static { - typeDesc.setXmlType( - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteCustomFieldValue")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("customfieldId"); - elemField.setXmlName(new javax.xml.namespace.QName("", "customfieldId")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("key"); - elemField.setXmlName(new javax.xml.namespace.QName("", "key")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("values"); - elemField.setXmlName(new javax.xml.namespace.QName("", "values")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteEntity.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteEntity.java deleted file mode 100644 index e1bbdb5602c2..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteEntity.java +++ /dev/null @@ -1,88 +0,0 @@ -/** - * RemoteEntity.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteEntity implements java.io.Serializable { - public RemoteEntity() { - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteEntity)) { - return false; - } - RemoteEntity other = (RemoteEntity) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true; - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteEntity.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteEntity")); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteException.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteException.java deleted file mode 100644 index 1858c1cc9e8a..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteException.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * RemoteException.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteException extends org.apache.axis.AxisFault implements java.io.Serializable { - public RemoteException() { - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteException)) { - return false; - } - RemoteException other = (RemoteException) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true; - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteException.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteException")); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - - - /** - * Writes the exception data to the faultDetails - */ - public void writeDetails(javax.xml.namespace.QName qname, org.apache.axis.encoding.SerializationContext context) - throws java.io.IOException { - context.serialize(qname, null, this); - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteField.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteField.java deleted file mode 100644 index f96464104d66..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteField.java +++ /dev/null @@ -1,97 +0,0 @@ -/** - * RemoteField.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteField extends AbstractNamedRemoteEntity - implements java.io.Serializable { - public RemoteField() { - } - - public RemoteField( - String id, - String name) { - super( - id, - name); - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteField)) { - return false; - } - RemoteField other = (RemoteField) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteField.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteField")); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteFieldValue.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteFieldValue.java deleted file mode 100644 index 942cc3dae319..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteFieldValue.java +++ /dev/null @@ -1,171 +0,0 @@ -/** - * RemoteFieldValue.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteFieldValue implements java.io.Serializable { - private String id; - - private String[] values; - - public RemoteFieldValue() { - } - - public RemoteFieldValue( - String id, - String[] values) { - this.id = id; - this.values = values; - } - - - /** - * Gets the id value for this RemoteFieldValue. - * - * @return id - */ - public String getId() { - return id; - } - - - /** - * Sets the id value for this RemoteFieldValue. - * - * @param id - */ - public void setId(String id) { - this.id = id; - } - - - /** - * Gets the values value for this RemoteFieldValue. - * - * @return values - */ - public String[] getValues() { - return values; - } - - - /** - * Sets the values value for this RemoteFieldValue. - * - * @param values - */ - public void setValues(String[] values) { - this.values = values; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteFieldValue)) { - return false; - } - RemoteFieldValue other = (RemoteFieldValue) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - ((this.id == null && other.getId() == null) || - (this.id != null && - this.id.equals(other.getId()))) && - ((this.values == null && other.getValues() == null) || - (this.values != null && - java.util.Arrays.equals(this.values, other.getValues()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - if (getId() != null) { - _hashCode += getId().hashCode(); - } - if (getValues() != null) { - for (int i = 0; - i < java.lang.reflect.Array.getLength(getValues()); - i++) { - Object obj = java.lang.reflect.Array.get(getValues(), i); - if (obj != null && - !obj.getClass().isArray()) { - _hashCode += obj.hashCode(); - } - } - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteFieldValue.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteFieldValue")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("id"); - elemField.setXmlName(new javax.xml.namespace.QName("", "id")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("values"); - elemField.setXmlName(new javax.xml.namespace.QName("", "values")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteFilter.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteFilter.java deleted file mode 100644 index 647b4d067abf..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteFilter.java +++ /dev/null @@ -1,241 +0,0 @@ -/** - * RemoteFilter.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteFilter extends AbstractNamedRemoteEntity - implements java.io.Serializable { - private String author; - - private String description; - - private String project; - - private String xml; - - public RemoteFilter() { - } - - public RemoteFilter( - String id, - String name, - String author, - String description, - String project, - String xml) { - super( - id, - name); - this.author = author; - this.description = description; - this.project = project; - this.xml = xml; - } - - - /** - * Gets the author value for this RemoteFilter. - * - * @return author - */ - public String getAuthor() { - return author; - } - - - /** - * Sets the author value for this RemoteFilter. - * - * @param author - */ - public void setAuthor(String author) { - this.author = author; - } - - - /** - * Gets the description value for this RemoteFilter. - * - * @return description - */ - public String getDescription() { - return description; - } - - - /** - * Sets the description value for this RemoteFilter. - * - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - - - /** - * Gets the project value for this RemoteFilter. - * - * @return project - */ - public String getProject() { - return project; - } - - - /** - * Sets the project value for this RemoteFilter. - * - * @param project - */ - public void setProject(String project) { - this.project = project; - } - - - /** - * Gets the xml value for this RemoteFilter. - * - * @return xml - */ - public String getXml() { - return xml; - } - - - /** - * Sets the xml value for this RemoteFilter. - * - * @param xml - */ - public void setXml(String xml) { - this.xml = xml; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteFilter)) { - return false; - } - RemoteFilter other = (RemoteFilter) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj) && - ((this.author == null && other.getAuthor() == null) || - (this.author != null && - this.author.equals(other.getAuthor()))) && - ((this.description == null && other.getDescription() == null) || - (this.description != null && - this.description.equals(other.getDescription()))) && - ((this.project == null && other.getProject() == null) || - (this.project != null && - this.project.equals(other.getProject()))) && - ((this.xml == null && other.getXml() == null) || - (this.xml != null && - this.xml.equals(other.getXml()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - if (getAuthor() != null) { - _hashCode += getAuthor().hashCode(); - } - if (getDescription() != null) { - _hashCode += getDescription().hashCode(); - } - if (getProject() != null) { - _hashCode += getProject().hashCode(); - } - if (getXml() != null) { - _hashCode += getXml().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteFilter.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteFilter")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("author"); - elemField.setXmlName(new javax.xml.namespace.QName("", "author")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("description"); - elemField.setXmlName(new javax.xml.namespace.QName("", "description")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("project"); - elemField.setXmlName(new javax.xml.namespace.QName("", "project")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("xml"); - elemField.setXmlName(new javax.xml.namespace.QName("", "xml")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteGroup.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteGroup.java deleted file mode 100644 index 2f3d442513c8..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteGroup.java +++ /dev/null @@ -1,171 +0,0 @@ -/** - * RemoteGroup.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteGroup extends RemoteEntity implements java.io.Serializable { - private String name; - - private RemoteUser[] users; - - public RemoteGroup() { - } - - public RemoteGroup( - String name, - RemoteUser[] users) { - this.name = name; - this.users = users; - } - - - /** - * Gets the name value for this RemoteGroup. - * - * @return name - */ - public String getName() { - return name; - } - - - /** - * Sets the name value for this RemoteGroup. - * - * @param name - */ - public void setName(String name) { - this.name = name; - } - - - /** - * Gets the users value for this RemoteGroup. - * - * @return users - */ - public RemoteUser[] getUsers() { - return users; - } - - - /** - * Sets the users value for this RemoteGroup. - * - * @param users - */ - public void setUsers(RemoteUser[] users) { - this.users = users; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteGroup)) { - return false; - } - RemoteGroup other = (RemoteGroup) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj) && - ((this.name == null && other.getName() == null) || - (this.name != null && - this.name.equals(other.getName()))) && - ((this.users == null && other.getUsers() == null) || - (this.users != null && - java.util.Arrays.equals(this.users, other.getUsers()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - if (getName() != null) { - _hashCode += getName().hashCode(); - } - if (getUsers() != null) { - for (int i = 0; - i < java.lang.reflect.Array.getLength(getUsers()); - i++) { - Object obj = java.lang.reflect.Array.get(getUsers(), i); - if (obj != null && - !obj.getClass().isArray()) { - _hashCode += obj.hashCode(); - } - } - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteGroup.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteGroup")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("name"); - elemField.setXmlName(new javax.xml.namespace.QName("", "name")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("users"); - elemField.setXmlName(new javax.xml.namespace.QName("", "users")); - elemField.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteUser")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteIssue.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteIssue.java deleted file mode 100644 index 39c3caf3b8c9..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteIssue.java +++ /dev/null @@ -1,856 +0,0 @@ -/** - * RemoteIssue.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteIssue extends AbstractRemoteEntity - implements java.io.Serializable { - private RemoteVersion[] affectsVersions; - - private String assignee; - - private String[] attachmentNames; - - private RemoteComponent[] components; - - private java.util.Calendar created; - - private RemoteCustomFieldValue[] customFieldValues; - - private String description; - - private java.util.Calendar duedate; - - private String environment; - - private RemoteVersion[] fixVersions; - - private String key; - - private String priority; - - private String project; - - private String reporter; - - private String resolution; - - private String status; - - private String summary; - - private String type; - - private java.util.Calendar updated; - - private Long votes; - - public RemoteIssue() { - } - - public RemoteIssue( - String id, - RemoteVersion[] affectsVersions, - String assignee, - String[] attachmentNames, - RemoteComponent[] components, - java.util.Calendar created, - RemoteCustomFieldValue[] customFieldValues, - String description, - java.util.Calendar duedate, - String environment, - RemoteVersion[] fixVersions, - String key, - String priority, - String project, - String reporter, - String resolution, - String status, - String summary, - String type, - java.util.Calendar updated, - Long votes) { - super( - id); - this.affectsVersions = affectsVersions; - this.assignee = assignee; - this.attachmentNames = attachmentNames; - this.components = components; - this.created = created; - this.customFieldValues = customFieldValues; - this.description = description; - this.duedate = duedate; - this.environment = environment; - this.fixVersions = fixVersions; - this.key = key; - this.priority = priority; - this.project = project; - this.reporter = reporter; - this.resolution = resolution; - this.status = status; - this.summary = summary; - this.type = type; - this.updated = updated; - this.votes = votes; - } - - - /** - * Gets the affectsVersions value for this RemoteIssue. - * - * @return affectsVersions - */ - public RemoteVersion[] getAffectsVersions() { - return affectsVersions; - } - - - /** - * Sets the affectsVersions value for this RemoteIssue. - * - * @param affectsVersions - */ - public void setAffectsVersions(RemoteVersion[] affectsVersions) { - this.affectsVersions = affectsVersions; - } - - - /** - * Gets the assignee value for this RemoteIssue. - * - * @return assignee - */ - public String getAssignee() { - return assignee; - } - - - /** - * Sets the assignee value for this RemoteIssue. - * - * @param assignee - */ - public void setAssignee(String assignee) { - this.assignee = assignee; - } - - - /** - * Gets the attachmentNames value for this RemoteIssue. - * - * @return attachmentNames - */ - public String[] getAttachmentNames() { - return attachmentNames; - } - - - /** - * Sets the attachmentNames value for this RemoteIssue. - * - * @param attachmentNames - */ - public void setAttachmentNames(String[] attachmentNames) { - this.attachmentNames = attachmentNames; - } - - - /** - * Gets the components value for this RemoteIssue. - * - * @return components - */ - public RemoteComponent[] getComponents() { - return components; - } - - - /** - * Sets the components value for this RemoteIssue. - * - * @param components - */ - public void setComponents(RemoteComponent[] components) { - this.components = components; - } - - - /** - * Gets the created value for this RemoteIssue. - * - * @return created - */ - public java.util.Calendar getCreated() { - return created; - } - - - /** - * Sets the created value for this RemoteIssue. - * - * @param created - */ - public void setCreated(java.util.Calendar created) { - this.created = created; - } - - - /** - * Gets the customFieldValues value for this RemoteIssue. - * - * @return customFieldValues - */ - public RemoteCustomFieldValue[] getCustomFieldValues() { - return customFieldValues; - } - - - /** - * Sets the customFieldValues value for this RemoteIssue. - * - * @param customFieldValues - */ - public void setCustomFieldValues(RemoteCustomFieldValue[] customFieldValues) { - this.customFieldValues = customFieldValues; - } - - - /** - * Gets the description value for this RemoteIssue. - * - * @return description - */ - public String getDescription() { - return description; - } - - - /** - * Sets the description value for this RemoteIssue. - * - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - - - /** - * Gets the duedate value for this RemoteIssue. - * - * @return duedate - */ - public java.util.Calendar getDuedate() { - return duedate; - } - - - /** - * Sets the duedate value for this RemoteIssue. - * - * @param duedate - */ - public void setDuedate(java.util.Calendar duedate) { - this.duedate = duedate; - } - - - /** - * Gets the environment value for this RemoteIssue. - * - * @return environment - */ - public String getEnvironment() { - return environment; - } - - - /** - * Sets the environment value for this RemoteIssue. - * - * @param environment - */ - public void setEnvironment(String environment) { - this.environment = environment; - } - - - /** - * Gets the fixVersions value for this RemoteIssue. - * - * @return fixVersions - */ - public RemoteVersion[] getFixVersions() { - return fixVersions; - } - - - /** - * Sets the fixVersions value for this RemoteIssue. - * - * @param fixVersions - */ - public void setFixVersions(RemoteVersion[] fixVersions) { - this.fixVersions = fixVersions; - } - - - /** - * Gets the key value for this RemoteIssue. - * - * @return key - */ - public String getKey() { - return key; - } - - - /** - * Sets the key value for this RemoteIssue. - * - * @param key - */ - public void setKey(String key) { - this.key = key; - } - - - /** - * Gets the priority value for this RemoteIssue. - * - * @return priority - */ - public String getPriority() { - return priority; - } - - - /** - * Sets the priority value for this RemoteIssue. - * - * @param priority - */ - public void setPriority(String priority) { - this.priority = priority; - } - - - /** - * Gets the project value for this RemoteIssue. - * - * @return project - */ - public String getProject() { - return project; - } - - - /** - * Sets the project value for this RemoteIssue. - * - * @param project - */ - public void setProject(String project) { - this.project = project; - } - - - /** - * Gets the reporter value for this RemoteIssue. - * - * @return reporter - */ - public String getReporter() { - return reporter; - } - - - /** - * Sets the reporter value for this RemoteIssue. - * - * @param reporter - */ - public void setReporter(String reporter) { - this.reporter = reporter; - } - - - /** - * Gets the resolution value for this RemoteIssue. - * - * @return resolution - */ - public String getResolution() { - return resolution; - } - - - /** - * Sets the resolution value for this RemoteIssue. - * - * @param resolution - */ - public void setResolution(String resolution) { - this.resolution = resolution; - } - - - /** - * Gets the status value for this RemoteIssue. - * - * @return status - */ - public String getStatus() { - return status; - } - - - /** - * Sets the status value for this RemoteIssue. - * - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - - - /** - * Gets the summary value for this RemoteIssue. - * - * @return summary - */ - public String getSummary() { - return summary; - } - - - /** - * Sets the summary value for this RemoteIssue. - * - * @param summary - */ - public void setSummary(String summary) { - this.summary = summary; - } - - - /** - * Gets the type value for this RemoteIssue. - * - * @return type - */ - public String getType() { - return type; - } - - - /** - * Sets the type value for this RemoteIssue. - * - * @param type - */ - public void setType(String type) { - this.type = type; - } - - - /** - * Gets the updated value for this RemoteIssue. - * - * @return updated - */ - public java.util.Calendar getUpdated() { - return updated; - } - - - /** - * Sets the updated value for this RemoteIssue. - * - * @param updated - */ - public void setUpdated(java.util.Calendar updated) { - this.updated = updated; - } - - - /** - * Gets the votes value for this RemoteIssue. - * - * @return votes - */ - public Long getVotes() { - return votes; - } - - - /** - * Sets the votes value for this RemoteIssue. - * - * @param votes - */ - public void setVotes(Long votes) { - this.votes = votes; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteIssue)) { - return false; - } - RemoteIssue other = (RemoteIssue) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj) && - ((this.affectsVersions == null && other.getAffectsVersions() == null) || - (this.affectsVersions != null && - java.util.Arrays.equals(this.affectsVersions, other.getAffectsVersions()))) && - ((this.assignee == null && other.getAssignee() == null) || - (this.assignee != null && - this.assignee.equals(other.getAssignee()))) && - ((this.attachmentNames == null && other.getAttachmentNames() == null) || - (this.attachmentNames != null && - java.util.Arrays.equals(this.attachmentNames, other.getAttachmentNames()))) && - ((this.components == null && other.getComponents() == null) || - (this.components != null && - java.util.Arrays.equals(this.components, other.getComponents()))) && - ((this.created == null && other.getCreated() == null) || - (this.created != null && - this.created.equals(other.getCreated()))) && - ((this.customFieldValues == null && other.getCustomFieldValues() == null) || - (this.customFieldValues != null && - java.util.Arrays.equals(this.customFieldValues, other.getCustomFieldValues()))) && - ((this.description == null && other.getDescription() == null) || - (this.description != null && - this.description.equals(other.getDescription()))) && - ((this.duedate == null && other.getDuedate() == null) || - (this.duedate != null && - this.duedate.equals(other.getDuedate()))) && - ((this.environment == null && other.getEnvironment() == null) || - (this.environment != null && - this.environment.equals(other.getEnvironment()))) && - ((this.fixVersions == null && other.getFixVersions() == null) || - (this.fixVersions != null && - java.util.Arrays.equals(this.fixVersions, other.getFixVersions()))) && - ((this.key == null && other.getKey() == null) || - (this.key != null && - this.key.equals(other.getKey()))) && - ((this.priority == null && other.getPriority() == null) || - (this.priority != null && - this.priority.equals(other.getPriority()))) && - ((this.project == null && other.getProject() == null) || - (this.project != null && - this.project.equals(other.getProject()))) && - ((this.reporter == null && other.getReporter() == null) || - (this.reporter != null && - this.reporter.equals(other.getReporter()))) && - ((this.resolution == null && other.getResolution() == null) || - (this.resolution != null && - this.resolution.equals(other.getResolution()))) && - ((this.status == null && other.getStatus() == null) || - (this.status != null && - this.status.equals(other.getStatus()))) && - ((this.summary == null && other.getSummary() == null) || - (this.summary != null && - this.summary.equals(other.getSummary()))) && - ((this.type == null && other.getType() == null) || - (this.type != null && - this.type.equals(other.getType()))) && - ((this.updated == null && other.getUpdated() == null) || - (this.updated != null && - this.updated.equals(other.getUpdated()))) && - ((this.votes == null && other.getVotes() == null) || - (this.votes != null && - this.votes.equals(other.getVotes()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - if (getAffectsVersions() != null) { - for (int i = 0; - i < java.lang.reflect.Array.getLength(getAffectsVersions()); - i++) { - Object obj = java.lang.reflect.Array.get(getAffectsVersions(), i); - if (obj != null && - !obj.getClass().isArray()) { - _hashCode += obj.hashCode(); - } - } - } - if (getAssignee() != null) { - _hashCode += getAssignee().hashCode(); - } - if (getAttachmentNames() != null) { - for (int i = 0; - i < java.lang.reflect.Array.getLength(getAttachmentNames()); - i++) { - Object obj = java.lang.reflect.Array.get(getAttachmentNames(), i); - if (obj != null && - !obj.getClass().isArray()) { - _hashCode += obj.hashCode(); - } - } - } - if (getComponents() != null) { - for (int i = 0; - i < java.lang.reflect.Array.getLength(getComponents()); - i++) { - Object obj = java.lang.reflect.Array.get(getComponents(), i); - if (obj != null && - !obj.getClass().isArray()) { - _hashCode += obj.hashCode(); - } - } - } - if (getCreated() != null) { - _hashCode += getCreated().hashCode(); - } - if (getCustomFieldValues() != null) { - for (int i = 0; - i < java.lang.reflect.Array.getLength(getCustomFieldValues()); - i++) { - Object obj = java.lang.reflect.Array.get(getCustomFieldValues(), i); - if (obj != null && - !obj.getClass().isArray()) { - _hashCode += obj.hashCode(); - } - } - } - if (getDescription() != null) { - _hashCode += getDescription().hashCode(); - } - if (getDuedate() != null) { - _hashCode += getDuedate().hashCode(); - } - if (getEnvironment() != null) { - _hashCode += getEnvironment().hashCode(); - } - if (getFixVersions() != null) { - for (int i = 0; - i < java.lang.reflect.Array.getLength(getFixVersions()); - i++) { - Object obj = java.lang.reflect.Array.get(getFixVersions(), i); - if (obj != null && - !obj.getClass().isArray()) { - _hashCode += obj.hashCode(); - } - } - } - if (getKey() != null) { - _hashCode += getKey().hashCode(); - } - if (getPriority() != null) { - _hashCode += getPriority().hashCode(); - } - if (getProject() != null) { - _hashCode += getProject().hashCode(); - } - if (getReporter() != null) { - _hashCode += getReporter().hashCode(); - } - if (getResolution() != null) { - _hashCode += getResolution().hashCode(); - } - if (getStatus() != null) { - _hashCode += getStatus().hashCode(); - } - if (getSummary() != null) { - _hashCode += getSummary().hashCode(); - } - if (getType() != null) { - _hashCode += getType().hashCode(); - } - if (getUpdated() != null) { - _hashCode += getUpdated().hashCode(); - } - if (getVotes() != null) { - _hashCode += getVotes().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteIssue.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteIssue")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("affectsVersions"); - elemField.setXmlName(new javax.xml.namespace.QName("", "affectsVersions")); - elemField.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteVersion")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("assignee"); - elemField.setXmlName(new javax.xml.namespace.QName("", "assignee")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("attachmentNames"); - elemField.setXmlName(new javax.xml.namespace.QName("", "attachmentNames")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("components"); - elemField.setXmlName(new javax.xml.namespace.QName("", "components")); - elemField.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteComponent")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("created"); - elemField.setXmlName(new javax.xml.namespace.QName("", "created")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "dateTime")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("customFieldValues"); - elemField.setXmlName(new javax.xml.namespace.QName("", "customFieldValues")); - elemField.setXmlType( - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteCustomFieldValue")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("description"); - elemField.setXmlName(new javax.xml.namespace.QName("", "description")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("duedate"); - elemField.setXmlName(new javax.xml.namespace.QName("", "duedate")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "dateTime")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("environment"); - elemField.setXmlName(new javax.xml.namespace.QName("", "environment")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("fixVersions"); - elemField.setXmlName(new javax.xml.namespace.QName("", "fixVersions")); - elemField.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteVersion")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("key"); - elemField.setXmlName(new javax.xml.namespace.QName("", "key")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("priority"); - elemField.setXmlName(new javax.xml.namespace.QName("", "priority")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("project"); - elemField.setXmlName(new javax.xml.namespace.QName("", "project")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("reporter"); - elemField.setXmlName(new javax.xml.namespace.QName("", "reporter")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("resolution"); - elemField.setXmlName(new javax.xml.namespace.QName("", "resolution")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("status"); - elemField.setXmlName(new javax.xml.namespace.QName("", "status")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("summary"); - elemField.setXmlName(new javax.xml.namespace.QName("", "summary")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("type"); - elemField.setXmlName(new javax.xml.namespace.QName("", "type")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("updated"); - elemField.setXmlName(new javax.xml.namespace.QName("", "updated")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "dateTime")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("votes"); - elemField.setXmlName(new javax.xml.namespace.QName("", "votes")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteIssueType.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteIssueType.java deleted file mode 100644 index 217af21408d7..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteIssueType.java +++ /dev/null @@ -1,133 +0,0 @@ -/** - * RemoteIssueType.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteIssueType extends AbstractRemoteConstant - implements java.io.Serializable { - private boolean subTask; - - public RemoteIssueType() { - } - - public RemoteIssueType( - String id, - String name, - String description, - String icon, - boolean subTask) { - super( - id, - name, - description, - icon); - this.subTask = subTask; - } - - - /** - * Gets the subTask value for this RemoteIssueType. - * - * @return subTask - */ - public boolean isSubTask() { - return subTask; - } - - - /** - * Sets the subTask value for this RemoteIssueType. - * - * @param subTask - */ - public void setSubTask(boolean subTask) { - this.subTask = subTask; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteIssueType)) { - return false; - } - RemoteIssueType other = (RemoteIssueType) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj) && - this.subTask == other.isSubTask(); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - _hashCode += (isSubTask() ? Boolean.TRUE : Boolean.FALSE).hashCode(); - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteIssueType.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteIssueType")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("subTask"); - elemField.setXmlName(new javax.xml.namespace.QName("", "subTask")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteNamedObject.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteNamedObject.java deleted file mode 100644 index 709479f3a389..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteNamedObject.java +++ /dev/null @@ -1,97 +0,0 @@ -/** - * RemoteNamedObject.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteNamedObject extends AbstractNamedRemoteEntity - implements java.io.Serializable { - public RemoteNamedObject() { - } - - public RemoteNamedObject( - String id, - String name) { - super( - id, - name); - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteNamedObject)) { - return false; - } - RemoteNamedObject other = (RemoteNamedObject) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteNamedObject.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteNamedObject")); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemotePermission.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemotePermission.java deleted file mode 100644 index 68db863f39ac..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemotePermission.java +++ /dev/null @@ -1,163 +0,0 @@ -/** - * RemotePermission.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemotePermission implements java.io.Serializable { - private String name; - - private Long permission; - - public RemotePermission() { - } - - public RemotePermission( - String name, - Long permission) { - this.name = name; - this.permission = permission; - } - - - /** - * Gets the name value for this RemotePermission. - * - * @return name - */ - public String getName() { - return name; - } - - - /** - * Sets the name value for this RemotePermission. - * - * @param name - */ - public void setName(String name) { - this.name = name; - } - - - /** - * Gets the permission value for this RemotePermission. - * - * @return permission - */ - public Long getPermission() { - return permission; - } - - - /** - * Sets the permission value for this RemotePermission. - * - * @param permission - */ - public void setPermission(Long permission) { - this.permission = permission; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemotePermission)) { - return false; - } - RemotePermission other = (RemotePermission) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - ((this.name == null && other.getName() == null) || - (this.name != null && - this.name.equals(other.getName()))) && - ((this.permission == null && other.getPermission() == null) || - (this.permission != null && - this.permission.equals(other.getPermission()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - if (getName() != null) { - _hashCode += getName().hashCode(); - } - if (getPermission() != null) { - _hashCode += getPermission().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemotePermission.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermission")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("name"); - elemField.setXmlName(new javax.xml.namespace.QName("", "name")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("permission"); - elemField.setXmlName(new javax.xml.namespace.QName("", "permission")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemotePermissionException.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemotePermissionException.java deleted file mode 100644 index 81397a14af87..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemotePermissionException.java +++ /dev/null @@ -1,98 +0,0 @@ -/** - * RemotePermissionException.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemotePermissionException extends RemoteException - implements java.io.Serializable { - public RemotePermissionException() { - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemotePermissionException)) { - return false; - } - RemotePermissionException other = (RemotePermissionException) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemotePermissionException.class, true); - - static { - typeDesc.setXmlType( - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemotePermissionException")); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - - - /** - * Writes the exception data to the faultDetails - */ - public void writeDetails(javax.xml.namespace.QName qname, org.apache.axis.encoding.SerializationContext context) - throws java.io.IOException { - context.serialize(qname, null, this); - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemotePermissionMapping.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemotePermissionMapping.java deleted file mode 100644 index 7ae7016ace56..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemotePermissionMapping.java +++ /dev/null @@ -1,172 +0,0 @@ -/** - * RemotePermissionMapping.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemotePermissionMapping implements java.io.Serializable { - private RemotePermission permission; - - private RemoteEntity[] remoteEntities; - - public RemotePermissionMapping() { - } - - public RemotePermissionMapping( - RemotePermission permission, - RemoteEntity[] remoteEntities) { - this.permission = permission; - this.remoteEntities = remoteEntities; - } - - - /** - * Gets the permission value for this RemotePermissionMapping. - * - * @return permission - */ - public RemotePermission getPermission() { - return permission; - } - - - /** - * Sets the permission value for this RemotePermissionMapping. - * - * @param permission - */ - public void setPermission(RemotePermission permission) { - this.permission = permission; - } - - - /** - * Gets the remoteEntities value for this RemotePermissionMapping. - * - * @return remoteEntities - */ - public RemoteEntity[] getRemoteEntities() { - return remoteEntities; - } - - - /** - * Sets the remoteEntities value for this RemotePermissionMapping. - * - * @param remoteEntities - */ - public void setRemoteEntities(RemoteEntity[] remoteEntities) { - this.remoteEntities = remoteEntities; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemotePermissionMapping)) { - return false; - } - RemotePermissionMapping other = (RemotePermissionMapping) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - ((this.permission == null && other.getPermission() == null) || - (this.permission != null && - this.permission.equals(other.getPermission()))) && - ((this.remoteEntities == null && other.getRemoteEntities() == null) || - (this.remoteEntities != null && - java.util.Arrays.equals(this.remoteEntities, other.getRemoteEntities()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - if (getPermission() != null) { - _hashCode += getPermission().hashCode(); - } - if (getRemoteEntities() != null) { - for (int i = 0; - i < java.lang.reflect.Array.getLength(getRemoteEntities()); - i++) { - Object obj = java.lang.reflect.Array.get(getRemoteEntities(), i); - if (obj != null && - !obj.getClass().isArray()) { - _hashCode += obj.hashCode(); - } - } - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemotePermissionMapping.class, true); - - static { - typeDesc.setXmlType( - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermissionMapping")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("permission"); - elemField.setXmlName(new javax.xml.namespace.QName("", "permission")); - elemField.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermission")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("remoteEntities"); - elemField.setXmlName(new javax.xml.namespace.QName("", "remoteEntities")); - elemField.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteEntity")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemotePermissionScheme.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemotePermissionScheme.java deleted file mode 100644 index 26fa9517ec5d..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemotePermissionScheme.java +++ /dev/null @@ -1,147 +0,0 @@ -/** - * RemotePermissionScheme.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemotePermissionScheme extends RemoteScheme - implements java.io.Serializable { - private RemotePermissionMapping[] permissionMappings; - - public RemotePermissionScheme() { - } - - public RemotePermissionScheme( - String description, - Long id, - String name, - String type, - RemotePermissionMapping[] permissionMappings) { - super( - description, - id, - name, - type); - this.permissionMappings = permissionMappings; - } - - - /** - * Gets the permissionMappings value for this RemotePermissionScheme. - * - * @return permissionMappings - */ - public RemotePermissionMapping[] getPermissionMappings() { - return permissionMappings; - } - - - /** - * Sets the permissionMappings value for this RemotePermissionScheme. - * - * @param permissionMappings - */ - public void setPermissionMappings(RemotePermissionMapping[] permissionMappings) { - this.permissionMappings = permissionMappings; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemotePermissionScheme)) { - return false; - } - RemotePermissionScheme other = (RemotePermissionScheme) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj) && - ((this.permissionMappings == null && other.getPermissionMappings() == null) || - (this.permissionMappings != null && - java.util.Arrays.equals(this.permissionMappings, other.getPermissionMappings()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - if (getPermissionMappings() != null) { - for (int i = 0; - i < java.lang.reflect.Array.getLength(getPermissionMappings()); - i++) { - Object obj = java.lang.reflect.Array.get(getPermissionMappings(), i); - if (obj != null && - !obj.getClass().isArray()) { - _hashCode += obj.hashCode(); - } - } - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemotePermissionScheme.class, true); - - static { - typeDesc.setXmlType( - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermissionScheme")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("permissionMappings"); - elemField.setXmlName(new javax.xml.namespace.QName("", "permissionMappings")); - elemField.setXmlType( - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermissionMapping")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemotePriority.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemotePriority.java deleted file mode 100644 index 2fc230561403..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemotePriority.java +++ /dev/null @@ -1,137 +0,0 @@ -/** - * RemotePriority.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemotePriority extends AbstractRemoteConstant - implements java.io.Serializable { - private String color; - - public RemotePriority() { - } - - public RemotePriority( - String id, - String name, - String description, - String icon, - String color) { - super( - id, - name, - description, - icon); - this.color = color; - } - - - /** - * Gets the color value for this RemotePriority. - * - * @return color - */ - public String getColor() { - return color; - } - - - /** - * Sets the color value for this RemotePriority. - * - * @param color - */ - public void setColor(String color) { - this.color = color; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemotePriority)) { - return false; - } - RemotePriority other = (RemotePriority) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj) && - ((this.color == null && other.getColor() == null) || - (this.color != null && - this.color.equals(other.getColor()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - if (getColor() != null) { - _hashCode += getColor().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemotePriority.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePriority")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("color"); - elemField.setXmlName(new javax.xml.namespace.QName("", "color")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteProject.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteProject.java deleted file mode 100644 index fbf94f8ee264..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteProject.java +++ /dev/null @@ -1,386 +0,0 @@ -/** - * RemoteProject.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteProject extends AbstractNamedRemoteEntity - implements java.io.Serializable { - private String description; - - private RemoteScheme issueSecurityScheme; - - private String key; - - private String lead; - - private RemoteScheme notificationScheme; - - private RemotePermissionScheme permissionScheme; - - private String projectUrl; - - private String url; - - public RemoteProject() { - } - - public RemoteProject( - String id, - String name, - String description, - RemoteScheme issueSecurityScheme, - String key, - String lead, - RemoteScheme notificationScheme, - RemotePermissionScheme permissionScheme, - String projectUrl, - String url) { - super( - id, - name); - this.description = description; - this.issueSecurityScheme = issueSecurityScheme; - this.key = key; - this.lead = lead; - this.notificationScheme = notificationScheme; - this.permissionScheme = permissionScheme; - this.projectUrl = projectUrl; - this.url = url; - } - - - /** - * Gets the description value for this RemoteProject. - * - * @return description - */ - public String getDescription() { - return description; - } - - - /** - * Sets the description value for this RemoteProject. - * - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - - - /** - * Gets the issueSecurityScheme value for this RemoteProject. - * - * @return issueSecurityScheme - */ - public RemoteScheme getIssueSecurityScheme() { - return issueSecurityScheme; - } - - - /** - * Sets the issueSecurityScheme value for this RemoteProject. - * - * @param issueSecurityScheme - */ - public void setIssueSecurityScheme(RemoteScheme issueSecurityScheme) { - this.issueSecurityScheme = issueSecurityScheme; - } - - - /** - * Gets the key value for this RemoteProject. - * - * @return key - */ - public String getKey() { - return key; - } - - - /** - * Sets the key value for this RemoteProject. - * - * @param key - */ - public void setKey(String key) { - this.key = key; - } - - - /** - * Gets the lead value for this RemoteProject. - * - * @return lead - */ - public String getLead() { - return lead; - } - - - /** - * Sets the lead value for this RemoteProject. - * - * @param lead - */ - public void setLead(String lead) { - this.lead = lead; - } - - - /** - * Gets the notificationScheme value for this RemoteProject. - * - * @return notificationScheme - */ - public RemoteScheme getNotificationScheme() { - return notificationScheme; - } - - - /** - * Sets the notificationScheme value for this RemoteProject. - * - * @param notificationScheme - */ - public void setNotificationScheme(RemoteScheme notificationScheme) { - this.notificationScheme = notificationScheme; - } - - - /** - * Gets the permissionScheme value for this RemoteProject. - * - * @return permissionScheme - */ - public RemotePermissionScheme getPermissionScheme() { - return permissionScheme; - } - - - /** - * Sets the permissionScheme value for this RemoteProject. - * - * @param permissionScheme - */ - public void setPermissionScheme(RemotePermissionScheme permissionScheme) { - this.permissionScheme = permissionScheme; - } - - - /** - * Gets the projectUrl value for this RemoteProject. - * - * @return projectUrl - */ - public String getProjectUrl() { - return projectUrl; - } - - - /** - * Sets the projectUrl value for this RemoteProject. - * - * @param projectUrl - */ - public void setProjectUrl(String projectUrl) { - this.projectUrl = projectUrl; - } - - - /** - * Gets the url value for this RemoteProject. - * - * @return url - */ - public String getUrl() { - return url; - } - - - /** - * Sets the url value for this RemoteProject. - * - * @param url - */ - public void setUrl(String url) { - this.url = url; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteProject)) { - return false; - } - RemoteProject other = (RemoteProject) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj) && - ((this.description == null && other.getDescription() == null) || - (this.description != null && - this.description.equals(other.getDescription()))) && - ((this.issueSecurityScheme == null && other.getIssueSecurityScheme() == null) || - (this.issueSecurityScheme != null && - this.issueSecurityScheme.equals(other.getIssueSecurityScheme()))) && - ((this.key == null && other.getKey() == null) || - (this.key != null && - this.key.equals(other.getKey()))) && - ((this.lead == null && other.getLead() == null) || - (this.lead != null && - this.lead.equals(other.getLead()))) && - ((this.notificationScheme == null && other.getNotificationScheme() == null) || - (this.notificationScheme != null && - this.notificationScheme.equals(other.getNotificationScheme()))) && - ((this.permissionScheme == null && other.getPermissionScheme() == null) || - (this.permissionScheme != null && - this.permissionScheme.equals(other.getPermissionScheme()))) && - ((this.projectUrl == null && other.getProjectUrl() == null) || - (this.projectUrl != null && - this.projectUrl.equals(other.getProjectUrl()))) && - ((this.url == null && other.getUrl() == null) || - (this.url != null && - this.url.equals(other.getUrl()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - if (getDescription() != null) { - _hashCode += getDescription().hashCode(); - } - if (getIssueSecurityScheme() != null) { - _hashCode += getIssueSecurityScheme().hashCode(); - } - if (getKey() != null) { - _hashCode += getKey().hashCode(); - } - if (getLead() != null) { - _hashCode += getLead().hashCode(); - } - if (getNotificationScheme() != null) { - _hashCode += getNotificationScheme().hashCode(); - } - if (getPermissionScheme() != null) { - _hashCode += getPermissionScheme().hashCode(); - } - if (getProjectUrl() != null) { - _hashCode += getProjectUrl().hashCode(); - } - if (getUrl() != null) { - _hashCode += getUrl().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteProject.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("description"); - elemField.setXmlName(new javax.xml.namespace.QName("", "description")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("issueSecurityScheme"); - elemField.setXmlName(new javax.xml.namespace.QName("", "issueSecurityScheme")); - elemField.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteScheme")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("key"); - elemField.setXmlName(new javax.xml.namespace.QName("", "key")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("lead"); - elemField.setXmlName(new javax.xml.namespace.QName("", "lead")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("notificationScheme"); - elemField.setXmlName(new javax.xml.namespace.QName("", "notificationScheme")); - elemField.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteScheme")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("permissionScheme"); - elemField.setXmlName(new javax.xml.namespace.QName("", "permissionScheme")); - elemField.setXmlType( - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemotePermissionScheme")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("projectUrl"); - elemField.setXmlName(new javax.xml.namespace.QName("", "projectUrl")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("url"); - elemField.setXmlName(new javax.xml.namespace.QName("", "url")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteProjectRole.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteProjectRole.java deleted file mode 100644 index f239e0be25bb..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteProjectRole.java +++ /dev/null @@ -1,199 +0,0 @@ -/** - * RemoteProjectRole.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteProjectRole implements java.io.Serializable { - private String description; - - private Long id; - - private String name; - - public RemoteProjectRole() { - } - - public RemoteProjectRole( - String description, - Long id, - String name) { - this.description = description; - this.id = id; - this.name = name; - } - - - /** - * Gets the description value for this RemoteProjectRole. - * - * @return description - */ - public String getDescription() { - return description; - } - - - /** - * Sets the description value for this RemoteProjectRole. - * - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - - - /** - * Gets the id value for this RemoteProjectRole. - * - * @return id - */ - public Long getId() { - return id; - } - - - /** - * Sets the id value for this RemoteProjectRole. - * - * @param id - */ - public void setId(Long id) { - this.id = id; - } - - - /** - * Gets the name value for this RemoteProjectRole. - * - * @return name - */ - public String getName() { - return name; - } - - - /** - * Sets the name value for this RemoteProjectRole. - * - * @param name - */ - public void setName(String name) { - this.name = name; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteProjectRole)) { - return false; - } - RemoteProjectRole other = (RemoteProjectRole) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - ((this.description == null && other.getDescription() == null) || - (this.description != null && - this.description.equals(other.getDescription()))) && - ((this.id == null && other.getId() == null) || - (this.id != null && - this.id.equals(other.getId()))) && - ((this.name == null && other.getName() == null) || - (this.name != null && - this.name.equals(other.getName()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - if (getDescription() != null) { - _hashCode += getDescription().hashCode(); - } - if (getId() != null) { - _hashCode += getId().hashCode(); - } - if (getName() != null) { - _hashCode += getName().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteProjectRole.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("description"); - elemField.setXmlName(new javax.xml.namespace.QName("", "description")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("id"); - elemField.setXmlName(new javax.xml.namespace.QName("", "id")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("name"); - elemField.setXmlName(new javax.xml.namespace.QName("", "name")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteProjectRoleActors.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteProjectRoleActors.java deleted file mode 100644 index 42c182324675..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteProjectRoleActors.java +++ /dev/null @@ -1,136 +0,0 @@ -/** - * RemoteProjectRoleActors.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteProjectRoleActors extends RemoteRoleActors - implements java.io.Serializable { - private RemoteProject project; - - public RemoteProjectRoleActors() { - } - - public RemoteProjectRoleActors( - RemoteProjectRole projectRole, - RemoteRoleActor[] roleActors, - RemoteUser[] users, - RemoteProject project) { - super( - projectRole, - roleActors, - users); - this.project = project; - } - - - /** - * Gets the project value for this RemoteProjectRoleActors. - * - * @return project - */ - public RemoteProject getProject() { - return project; - } - - - /** - * Sets the project value for this RemoteProjectRoleActors. - * - * @param project - */ - public void setProject(RemoteProject project) { - this.project = project; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteProjectRoleActors)) { - return false; - } - RemoteProjectRoleActors other = (RemoteProjectRoleActors) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj) && - ((this.project == null && other.getProject() == null) || - (this.project != null && - this.project.equals(other.getProject()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - if (getProject() != null) { - _hashCode += getProject().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteProjectRoleActors.class, true); - - static { - typeDesc.setXmlType( - new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRoleActors")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("project"); - elemField.setXmlName(new javax.xml.namespace.QName("", "project")); - elemField.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProject")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteResolution.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteResolution.java deleted file mode 100644 index 75492b3c1c49..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteResolution.java +++ /dev/null @@ -1,101 +0,0 @@ -/** - * RemoteResolution.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteResolution extends AbstractRemoteConstant - implements java.io.Serializable { - public RemoteResolution() { - } - - public RemoteResolution( - String id, - String name, - String description, - String icon) { - super( - id, - name, - description, - icon); - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteResolution)) { - return false; - } - RemoteResolution other = (RemoteResolution) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteResolution.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteResolution")); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteRoleActor.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteRoleActor.java deleted file mode 100644 index bfb617d9b368..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteRoleActor.java +++ /dev/null @@ -1,279 +0,0 @@ -/** - * RemoteRoleActor.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteRoleActor implements java.io.Serializable { - private String descriptor; - - private String parameter; - - private RemoteProjectRole projectRole; - - private String type; - - private RemoteUser[] users; - - public RemoteRoleActor() { - } - - public RemoteRoleActor( - String descriptor, - String parameter, - RemoteProjectRole projectRole, - String type, - RemoteUser[] users) { - this.descriptor = descriptor; - this.parameter = parameter; - this.projectRole = projectRole; - this.type = type; - this.users = users; - } - - - /** - * Gets the descriptor value for this RemoteRoleActor. - * - * @return descriptor - */ - public String getDescriptor() { - return descriptor; - } - - - /** - * Sets the descriptor value for this RemoteRoleActor. - * - * @param descriptor - */ - public void setDescriptor(String descriptor) { - this.descriptor = descriptor; - } - - - /** - * Gets the parameter value for this RemoteRoleActor. - * - * @return parameter - */ - public String getParameter() { - return parameter; - } - - - /** - * Sets the parameter value for this RemoteRoleActor. - * - * @param parameter - */ - public void setParameter(String parameter) { - this.parameter = parameter; - } - - - /** - * Gets the projectRole value for this RemoteRoleActor. - * - * @return projectRole - */ - public RemoteProjectRole getProjectRole() { - return projectRole; - } - - - /** - * Sets the projectRole value for this RemoteRoleActor. - * - * @param projectRole - */ - public void setProjectRole(RemoteProjectRole projectRole) { - this.projectRole = projectRole; - } - - - /** - * Gets the type value for this RemoteRoleActor. - * - * @return type - */ - public String getType() { - return type; - } - - - /** - * Sets the type value for this RemoteRoleActor. - * - * @param type - */ - public void setType(String type) { - this.type = type; - } - - - /** - * Gets the users value for this RemoteRoleActor. - * - * @return users - */ - public RemoteUser[] getUsers() { - return users; - } - - - /** - * Sets the users value for this RemoteRoleActor. - * - * @param users - */ - public void setUsers(RemoteUser[] users) { - this.users = users; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteRoleActor)) { - return false; - } - RemoteRoleActor other = (RemoteRoleActor) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - ((this.descriptor == null && other.getDescriptor() == null) || - (this.descriptor != null && - this.descriptor.equals(other.getDescriptor()))) && - ((this.parameter == null && other.getParameter() == null) || - (this.parameter != null && - this.parameter.equals(other.getParameter()))) && - ((this.projectRole == null && other.getProjectRole() == null) || - (this.projectRole != null && - this.projectRole.equals(other.getProjectRole()))) && - ((this.type == null && other.getType() == null) || - (this.type != null && - this.type.equals(other.getType()))) && - ((this.users == null && other.getUsers() == null) || - (this.users != null && - java.util.Arrays.equals(this.users, other.getUsers()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - if (getDescriptor() != null) { - _hashCode += getDescriptor().hashCode(); - } - if (getParameter() != null) { - _hashCode += getParameter().hashCode(); - } - if (getProjectRole() != null) { - _hashCode += getProjectRole().hashCode(); - } - if (getType() != null) { - _hashCode += getType().hashCode(); - } - if (getUsers() != null) { - for (int i = 0; - i < java.lang.reflect.Array.getLength(getUsers()); - i++) { - Object obj = java.lang.reflect.Array.get(getUsers(), i); - if (obj != null && - !obj.getClass().isArray()) { - _hashCode += obj.hashCode(); - } - } - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteRoleActor.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteRoleActor")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("descriptor"); - elemField.setXmlName(new javax.xml.namespace.QName("", "descriptor")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("parameter"); - elemField.setXmlName(new javax.xml.namespace.QName("", "parameter")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("projectRole"); - elemField.setXmlName(new javax.xml.namespace.QName("", "projectRole")); - elemField.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("type"); - elemField.setXmlName(new javax.xml.namespace.QName("", "type")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("users"); - elemField.setXmlName(new javax.xml.namespace.QName("", "users")); - elemField.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteUser")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteRoleActors.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteRoleActors.java deleted file mode 100644 index 0b8b552a753a..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteRoleActors.java +++ /dev/null @@ -1,215 +0,0 @@ -/** - * RemoteRoleActors.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteRoleActors implements java.io.Serializable { - private RemoteProjectRole projectRole; - - private RemoteRoleActor[] roleActors; - - private RemoteUser[] users; - - public RemoteRoleActors() { - } - - public RemoteRoleActors( - RemoteProjectRole projectRole, - RemoteRoleActor[] roleActors, - RemoteUser[] users) { - this.projectRole = projectRole; - this.roleActors = roleActors; - this.users = users; - } - - - /** - * Gets the projectRole value for this RemoteRoleActors. - * - * @return projectRole - */ - public RemoteProjectRole getProjectRole() { - return projectRole; - } - - - /** - * Sets the projectRole value for this RemoteRoleActors. - * - * @param projectRole - */ - public void setProjectRole(RemoteProjectRole projectRole) { - this.projectRole = projectRole; - } - - - /** - * Gets the roleActors value for this RemoteRoleActors. - * - * @return roleActors - */ - public RemoteRoleActor[] getRoleActors() { - return roleActors; - } - - - /** - * Sets the roleActors value for this RemoteRoleActors. - * - * @param roleActors - */ - public void setRoleActors(RemoteRoleActor[] roleActors) { - this.roleActors = roleActors; - } - - - /** - * Gets the users value for this RemoteRoleActors. - * - * @return users - */ - public RemoteUser[] getUsers() { - return users; - } - - - /** - * Sets the users value for this RemoteRoleActors. - * - * @param users - */ - public void setUsers(RemoteUser[] users) { - this.users = users; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteRoleActors)) { - return false; - } - RemoteRoleActors other = (RemoteRoleActors) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - ((this.projectRole == null && other.getProjectRole() == null) || - (this.projectRole != null && - this.projectRole.equals(other.getProjectRole()))) && - ((this.roleActors == null && other.getRoleActors() == null) || - (this.roleActors != null && - java.util.Arrays.equals(this.roleActors, other.getRoleActors()))) && - ((this.users == null && other.getUsers() == null) || - (this.users != null && - java.util.Arrays.equals(this.users, other.getUsers()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - if (getProjectRole() != null) { - _hashCode += getProjectRole().hashCode(); - } - if (getRoleActors() != null) { - for (int i = 0; - i < java.lang.reflect.Array.getLength(getRoleActors()); - i++) { - Object obj = java.lang.reflect.Array.get(getRoleActors(), i); - if (obj != null && - !obj.getClass().isArray()) { - _hashCode += obj.hashCode(); - } - } - } - if (getUsers() != null) { - for (int i = 0; - i < java.lang.reflect.Array.getLength(getUsers()); - i++) { - Object obj = java.lang.reflect.Array.get(getUsers(), i); - if (obj != null && - !obj.getClass().isArray()) { - _hashCode += obj.hashCode(); - } - } - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteRoleActors.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteRoleActors")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("projectRole"); - elemField.setXmlName(new javax.xml.namespace.QName("", "projectRole")); - elemField.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteProjectRole")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("roleActors"); - elemField.setXmlName(new javax.xml.namespace.QName("", "roleActors")); - elemField.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteRoleActor")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("users"); - elemField.setXmlName(new javax.xml.namespace.QName("", "users")); - elemField.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteUser")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteScheme.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteScheme.java deleted file mode 100644 index 26c2702d71ef..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteScheme.java +++ /dev/null @@ -1,235 +0,0 @@ -/** - * RemoteScheme.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteScheme implements java.io.Serializable { - private String description; - - private Long id; - - private String name; - - private String type; - - public RemoteScheme() { - } - - public RemoteScheme( - String description, - Long id, - String name, - String type) { - this.description = description; - this.id = id; - this.name = name; - this.type = type; - } - - - /** - * Gets the description value for this RemoteScheme. - * - * @return description - */ - public String getDescription() { - return description; - } - - - /** - * Sets the description value for this RemoteScheme. - * - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - - - /** - * Gets the id value for this RemoteScheme. - * - * @return id - */ - public Long getId() { - return id; - } - - - /** - * Sets the id value for this RemoteScheme. - * - * @param id - */ - public void setId(Long id) { - this.id = id; - } - - - /** - * Gets the name value for this RemoteScheme. - * - * @return name - */ - public String getName() { - return name; - } - - - /** - * Sets the name value for this RemoteScheme. - * - * @param name - */ - public void setName(String name) { - this.name = name; - } - - - /** - * Gets the type value for this RemoteScheme. - * - * @return type - */ - public String getType() { - return type; - } - - - /** - * Sets the type value for this RemoteScheme. - * - * @param type - */ - public void setType(String type) { - this.type = type; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteScheme)) { - return false; - } - RemoteScheme other = (RemoteScheme) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - ((this.description == null && other.getDescription() == null) || - (this.description != null && - this.description.equals(other.getDescription()))) && - ((this.id == null && other.getId() == null) || - (this.id != null && - this.id.equals(other.getId()))) && - ((this.name == null && other.getName() == null) || - (this.name != null && - this.name.equals(other.getName()))) && - ((this.type == null && other.getType() == null) || - (this.type != null && - this.type.equals(other.getType()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - if (getDescription() != null) { - _hashCode += getDescription().hashCode(); - } - if (getId() != null) { - _hashCode += getId().hashCode(); - } - if (getName() != null) { - _hashCode += getName().hashCode(); - } - if (getType() != null) { - _hashCode += getType().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteScheme.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteScheme")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("description"); - elemField.setXmlName(new javax.xml.namespace.QName("", "description")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("id"); - elemField.setXmlName(new javax.xml.namespace.QName("", "id")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("name"); - elemField.setXmlName(new javax.xml.namespace.QName("", "name")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("type"); - elemField.setXmlName(new javax.xml.namespace.QName("", "type")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteSecurityLevel.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteSecurityLevel.java deleted file mode 100644 index e8d20ff5cd39..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteSecurityLevel.java +++ /dev/null @@ -1,133 +0,0 @@ -/** - * RemoteSecurityLevel.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteSecurityLevel extends AbstractNamedRemoteEntity - implements java.io.Serializable { - private String description; - - public RemoteSecurityLevel() { - } - - public RemoteSecurityLevel( - String id, - String name, - String description) { - super( - id, - name); - this.description = description; - } - - - /** - * Gets the description value for this RemoteSecurityLevel. - * - * @return description - */ - public String getDescription() { - return description; - } - - - /** - * Sets the description value for this RemoteSecurityLevel. - * - * @param description - */ - public void setDescription(String description) { - this.description = description; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteSecurityLevel)) { - return false; - } - RemoteSecurityLevel other = (RemoteSecurityLevel) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj) && - ((this.description == null && other.getDescription() == null) || - (this.description != null && - this.description.equals(other.getDescription()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - if (getDescription() != null) { - _hashCode += getDescription().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteSecurityLevel.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteSecurityLevel")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("description"); - elemField.setXmlName(new javax.xml.namespace.QName("", "description")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteServerInfo.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteServerInfo.java deleted file mode 100644 index d1711106da3c..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteServerInfo.java +++ /dev/null @@ -1,307 +0,0 @@ -/** - * RemoteServerInfo.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteServerInfo implements java.io.Serializable { - private String baseUrl; - - private java.util.Calendar buildDate; - - private String buildNumber; - - private String edition; - - private RemoteTimeInfo serverTime; - - private String version; - - public RemoteServerInfo() { - } - - public RemoteServerInfo( - String baseUrl, - java.util.Calendar buildDate, - String buildNumber, - String edition, - RemoteTimeInfo serverTime, - String version) { - this.baseUrl = baseUrl; - this.buildDate = buildDate; - this.buildNumber = buildNumber; - this.edition = edition; - this.serverTime = serverTime; - this.version = version; - } - - - /** - * Gets the baseUrl value for this RemoteServerInfo. - * - * @return baseUrl - */ - public String getBaseUrl() { - return baseUrl; - } - - - /** - * Sets the baseUrl value for this RemoteServerInfo. - * - * @param baseUrl - */ - public void setBaseUrl(String baseUrl) { - this.baseUrl = baseUrl; - } - - - /** - * Gets the buildDate value for this RemoteServerInfo. - * - * @return buildDate - */ - public java.util.Calendar getBuildDate() { - return buildDate; - } - - - /** - * Sets the buildDate value for this RemoteServerInfo. - * - * @param buildDate - */ - public void setBuildDate(java.util.Calendar buildDate) { - this.buildDate = buildDate; - } - - - /** - * Gets the buildNumber value for this RemoteServerInfo. - * - * @return buildNumber - */ - public String getBuildNumber() { - return buildNumber; - } - - - /** - * Sets the buildNumber value for this RemoteServerInfo. - * - * @param buildNumber - */ - public void setBuildNumber(String buildNumber) { - this.buildNumber = buildNumber; - } - - - /** - * Gets the edition value for this RemoteServerInfo. - * - * @return edition - */ - public String getEdition() { - return edition; - } - - - /** - * Sets the edition value for this RemoteServerInfo. - * - * @param edition - */ - public void setEdition(String edition) { - this.edition = edition; - } - - - /** - * Gets the serverTime value for this RemoteServerInfo. - * - * @return serverTime - */ - public RemoteTimeInfo getServerTime() { - return serverTime; - } - - - /** - * Sets the serverTime value for this RemoteServerInfo. - * - * @param serverTime - */ - public void setServerTime(RemoteTimeInfo serverTime) { - this.serverTime = serverTime; - } - - - /** - * Gets the version value for this RemoteServerInfo. - * - * @return version - */ - public String getVersion() { - return version; - } - - - /** - * Sets the version value for this RemoteServerInfo. - * - * @param version - */ - public void setVersion(String version) { - this.version = version; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteServerInfo)) { - return false; - } - RemoteServerInfo other = (RemoteServerInfo) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - ((this.baseUrl == null && other.getBaseUrl() == null) || - (this.baseUrl != null && - this.baseUrl.equals(other.getBaseUrl()))) && - ((this.buildDate == null && other.getBuildDate() == null) || - (this.buildDate != null && - this.buildDate.equals(other.getBuildDate()))) && - ((this.buildNumber == null && other.getBuildNumber() == null) || - (this.buildNumber != null && - this.buildNumber.equals(other.getBuildNumber()))) && - ((this.edition == null && other.getEdition() == null) || - (this.edition != null && - this.edition.equals(other.getEdition()))) && - ((this.serverTime == null && other.getServerTime() == null) || - (this.serverTime != null && - this.serverTime.equals(other.getServerTime()))) && - ((this.version == null && other.getVersion() == null) || - (this.version != null && - this.version.equals(other.getVersion()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - if (getBaseUrl() != null) { - _hashCode += getBaseUrl().hashCode(); - } - if (getBuildDate() != null) { - _hashCode += getBuildDate().hashCode(); - } - if (getBuildNumber() != null) { - _hashCode += getBuildNumber().hashCode(); - } - if (getEdition() != null) { - _hashCode += getEdition().hashCode(); - } - if (getServerTime() != null) { - _hashCode += getServerTime().hashCode(); - } - if (getVersion() != null) { - _hashCode += getVersion().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteServerInfo.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteServerInfo")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("baseUrl"); - elemField.setXmlName(new javax.xml.namespace.QName("", "baseUrl")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("buildDate"); - elemField.setXmlName(new javax.xml.namespace.QName("", "buildDate")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "dateTime")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("buildNumber"); - elemField.setXmlName(new javax.xml.namespace.QName("", "buildNumber")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("edition"); - elemField.setXmlName(new javax.xml.namespace.QName("", "edition")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("serverTime"); - elemField.setXmlName(new javax.xml.namespace.QName("", "serverTime")); - elemField.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteTimeInfo")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("version"); - elemField.setXmlName(new javax.xml.namespace.QName("", "version")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteStatus.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteStatus.java deleted file mode 100644 index 7bc949b13e46..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteStatus.java +++ /dev/null @@ -1,101 +0,0 @@ -/** - * RemoteStatus.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteStatus extends AbstractRemoteConstant - implements java.io.Serializable { - public RemoteStatus() { - } - - public RemoteStatus( - String id, - String name, - String description, - String icon) { - super( - id, - name, - description, - icon); - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteStatus)) { - return false; - } - RemoteStatus other = (RemoteStatus) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteStatus.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteStatus")); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteTimeInfo.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteTimeInfo.java deleted file mode 100644 index 1a41ce6bd778..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteTimeInfo.java +++ /dev/null @@ -1,163 +0,0 @@ -/** - * RemoteTimeInfo.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteTimeInfo implements java.io.Serializable { - private String serverTime; - - private String timeZoneId; - - public RemoteTimeInfo() { - } - - public RemoteTimeInfo( - String serverTime, - String timeZoneId) { - this.serverTime = serverTime; - this.timeZoneId = timeZoneId; - } - - - /** - * Gets the serverTime value for this RemoteTimeInfo. - * - * @return serverTime - */ - public String getServerTime() { - return serverTime; - } - - - /** - * Sets the serverTime value for this RemoteTimeInfo. - * - * @param serverTime - */ - public void setServerTime(String serverTime) { - this.serverTime = serverTime; - } - - - /** - * Gets the timeZoneId value for this RemoteTimeInfo. - * - * @return timeZoneId - */ - public String getTimeZoneId() { - return timeZoneId; - } - - - /** - * Sets the timeZoneId value for this RemoteTimeInfo. - * - * @param timeZoneId - */ - public void setTimeZoneId(String timeZoneId) { - this.timeZoneId = timeZoneId; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteTimeInfo)) { - return false; - } - RemoteTimeInfo other = (RemoteTimeInfo) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - ((this.serverTime == null && other.getServerTime() == null) || - (this.serverTime != null && - this.serverTime.equals(other.getServerTime()))) && - ((this.timeZoneId == null && other.getTimeZoneId() == null) || - (this.timeZoneId != null && - this.timeZoneId.equals(other.getTimeZoneId()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - if (getServerTime() != null) { - _hashCode += getServerTime().hashCode(); - } - if (getTimeZoneId() != null) { - _hashCode += getTimeZoneId().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteTimeInfo.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteTimeInfo")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("serverTime"); - elemField.setXmlName(new javax.xml.namespace.QName("", "serverTime")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("timeZoneId"); - elemField.setXmlName(new javax.xml.namespace.QName("", "timeZoneId")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteUser.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteUser.java deleted file mode 100644 index 5a936ce52cf8..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteUser.java +++ /dev/null @@ -1,199 +0,0 @@ -/** - * RemoteUser.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteUser extends RemoteEntity implements java.io.Serializable { - private String email; - - private String fullname; - - private String name; - - public RemoteUser() { - } - - public RemoteUser( - String email, - String fullname, - String name) { - this.email = email; - this.fullname = fullname; - this.name = name; - } - - - /** - * Gets the email value for this RemoteUser. - * - * @return email - */ - public String getEmail() { - return email; - } - - - /** - * Sets the email value for this RemoteUser. - * - * @param email - */ - public void setEmail(String email) { - this.email = email; - } - - - /** - * Gets the fullname value for this RemoteUser. - * - * @return fullname - */ - public String getFullname() { - return fullname; - } - - - /** - * Sets the fullname value for this RemoteUser. - * - * @param fullname - */ - public void setFullname(String fullname) { - this.fullname = fullname; - } - - - /** - * Gets the name value for this RemoteUser. - * - * @return name - */ - public String getName() { - return name; - } - - - /** - * Sets the name value for this RemoteUser. - * - * @param name - */ - public void setName(String name) { - this.name = name; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteUser)) { - return false; - } - RemoteUser other = (RemoteUser) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj) && - ((this.email == null && other.getEmail() == null) || - (this.email != null && - this.email.equals(other.getEmail()))) && - ((this.fullname == null && other.getFullname() == null) || - (this.fullname != null && - this.fullname.equals(other.getFullname()))) && - ((this.name == null && other.getName() == null) || - (this.name != null && - this.name.equals(other.getName()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - if (getEmail() != null) { - _hashCode += getEmail().hashCode(); - } - if (getFullname() != null) { - _hashCode += getFullname().hashCode(); - } - if (getName() != null) { - _hashCode += getName().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteUser.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteUser")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("email"); - elemField.setXmlName(new javax.xml.namespace.QName("", "email")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("fullname"); - elemField.setXmlName(new javax.xml.namespace.QName("", "fullname")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("name"); - elemField.setXmlName(new javax.xml.namespace.QName("", "name")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteValidationException.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteValidationException.java deleted file mode 100644 index f719e3ee337a..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteValidationException.java +++ /dev/null @@ -1,98 +0,0 @@ -/** - * RemoteValidationException.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteValidationException extends RemoteException - implements java.io.Serializable { - public RemoteValidationException() { - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteValidationException)) { - return false; - } - RemoteValidationException other = (RemoteValidationException) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteValidationException.class, true); - - static { - typeDesc.setXmlType( - new javax.xml.namespace.QName("http://exception.rpc.jira.atlassian.com", "RemoteValidationException")); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - - - /** - * Writes the exception data to the faultDetails - */ - public void writeDetails(javax.xml.namespace.QName qname, org.apache.axis.encoding.SerializationContext context) - throws java.io.IOException { - context.serialize(qname, null, this); - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteVersion.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteVersion.java deleted file mode 100644 index 7a3dfd116794..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteVersion.java +++ /dev/null @@ -1,233 +0,0 @@ -/** - * RemoteVersion.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteVersion extends AbstractNamedRemoteEntity - implements java.io.Serializable { - private boolean archived; - - private java.util.Calendar releaseDate; - - private boolean released; - - private Long sequence; - - public RemoteVersion() { - } - - public RemoteVersion( - String id, - String name, - boolean archived, - java.util.Calendar releaseDate, - boolean released, - Long sequence) { - super( - id, - name); - this.archived = archived; - this.releaseDate = releaseDate; - this.released = released; - this.sequence = sequence; - } - - - /** - * Gets the archived value for this RemoteVersion. - * - * @return archived - */ - public boolean isArchived() { - return archived; - } - - - /** - * Sets the archived value for this RemoteVersion. - * - * @param archived - */ - public void setArchived(boolean archived) { - this.archived = archived; - } - - - /** - * Gets the releaseDate value for this RemoteVersion. - * - * @return releaseDate - */ - public java.util.Calendar getReleaseDate() { - return releaseDate; - } - - - /** - * Sets the releaseDate value for this RemoteVersion. - * - * @param releaseDate - */ - public void setReleaseDate(java.util.Calendar releaseDate) { - this.releaseDate = releaseDate; - } - - - /** - * Gets the released value for this RemoteVersion. - * - * @return released - */ - public boolean isReleased() { - return released; - } - - - /** - * Sets the released value for this RemoteVersion. - * - * @param released - */ - public void setReleased(boolean released) { - this.released = released; - } - - - /** - * Gets the sequence value for this RemoteVersion. - * - * @return sequence - */ - public Long getSequence() { - return sequence; - } - - - /** - * Sets the sequence value for this RemoteVersion. - * - * @param sequence - */ - public void setSequence(Long sequence) { - this.sequence = sequence; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteVersion)) { - return false; - } - RemoteVersion other = (RemoteVersion) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = super.equals(obj) && - this.archived == other.isArchived() && - ((this.releaseDate == null && other.getReleaseDate() == null) || - (this.releaseDate != null && - this.releaseDate.equals(other.getReleaseDate()))) && - this.released == other.isReleased() && - ((this.sequence == null && other.getSequence() == null) || - (this.sequence != null && - this.sequence.equals(other.getSequence()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = super.hashCode(); - _hashCode += (isArchived() ? Boolean.TRUE : Boolean.FALSE).hashCode(); - if (getReleaseDate() != null) { - _hashCode += getReleaseDate().hashCode(); - } - _hashCode += (isReleased() ? Boolean.TRUE : Boolean.FALSE).hashCode(); - if (getSequence() != null) { - _hashCode += getSequence().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteVersion.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteVersion")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("archived"); - elemField.setXmlName(new javax.xml.namespace.QName("", "archived")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("releaseDate"); - elemField.setXmlName(new javax.xml.namespace.QName("", "releaseDate")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "dateTime")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("released"); - elemField.setXmlName(new javax.xml.namespace.QName("", "released")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("sequence"); - elemField.setXmlName(new javax.xml.namespace.QName("", "sequence")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteWorklog.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteWorklog.java deleted file mode 100644 index fd06b608084c..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/RemoteWorklog.java +++ /dev/null @@ -1,483 +0,0 @@ -/** - * RemoteWorklog.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. - */ - -package com.atlassian.connector.commons.jira.soap.axis; - -public class RemoteWorklog implements java.io.Serializable { - private String author; - - private String comment; - - private java.util.Calendar created; - - private String groupLevel; - - private String id; - - private String roleLevelId; - - private java.util.Calendar startDate; - - private String timeSpent; - - private long timeSpentInSeconds; - - private String updateAuthor; - - private java.util.Calendar updated; - - public RemoteWorklog() { - } - - public RemoteWorklog( - String author, - String comment, - java.util.Calendar created, - String groupLevel, - String id, - String roleLevelId, - java.util.Calendar startDate, - String timeSpent, - long timeSpentInSeconds, - String updateAuthor, - java.util.Calendar updated) { - this.author = author; - this.comment = comment; - this.created = created; - this.groupLevel = groupLevel; - this.id = id; - this.roleLevelId = roleLevelId; - this.startDate = startDate; - this.timeSpent = timeSpent; - this.timeSpentInSeconds = timeSpentInSeconds; - this.updateAuthor = updateAuthor; - this.updated = updated; - } - - - /** - * Gets the author value for this RemoteWorklog. - * - * @return author - */ - public String getAuthor() { - return author; - } - - - /** - * Sets the author value for this RemoteWorklog. - * - * @param author - */ - public void setAuthor(String author) { - this.author = author; - } - - - /** - * Gets the comment value for this RemoteWorklog. - * - * @return comment - */ - public String getComment() { - return comment; - } - - - /** - * Sets the comment value for this RemoteWorklog. - * - * @param comment - */ - public void setComment(String comment) { - this.comment = comment; - } - - - /** - * Gets the created value for this RemoteWorklog. - * - * @return created - */ - public java.util.Calendar getCreated() { - return created; - } - - - /** - * Sets the created value for this RemoteWorklog. - * - * @param created - */ - public void setCreated(java.util.Calendar created) { - this.created = created; - } - - - /** - * Gets the groupLevel value for this RemoteWorklog. - * - * @return groupLevel - */ - public String getGroupLevel() { - return groupLevel; - } - - - /** - * Sets the groupLevel value for this RemoteWorklog. - * - * @param groupLevel - */ - public void setGroupLevel(String groupLevel) { - this.groupLevel = groupLevel; - } - - - /** - * Gets the id value for this RemoteWorklog. - * - * @return id - */ - public String getId() { - return id; - } - - - /** - * Sets the id value for this RemoteWorklog. - * - * @param id - */ - public void setId(String id) { - this.id = id; - } - - - /** - * Gets the roleLevelId value for this RemoteWorklog. - * - * @return roleLevelId - */ - public String getRoleLevelId() { - return roleLevelId; - } - - - /** - * Sets the roleLevelId value for this RemoteWorklog. - * - * @param roleLevelId - */ - public void setRoleLevelId(String roleLevelId) { - this.roleLevelId = roleLevelId; - } - - - /** - * Gets the startDate value for this RemoteWorklog. - * - * @return startDate - */ - public java.util.Calendar getStartDate() { - return startDate; - } - - - /** - * Sets the startDate value for this RemoteWorklog. - * - * @param startDate - */ - public void setStartDate(java.util.Calendar startDate) { - this.startDate = startDate; - } - - - /** - * Gets the timeSpent value for this RemoteWorklog. - * - * @return timeSpent - */ - public String getTimeSpent() { - return timeSpent; - } - - - /** - * Sets the timeSpent value for this RemoteWorklog. - * - * @param timeSpent - */ - public void setTimeSpent(String timeSpent) { - this.timeSpent = timeSpent; - } - - - /** - * Gets the timeSpentInSeconds value for this RemoteWorklog. - * - * @return timeSpentInSeconds - */ - public long getTimeSpentInSeconds() { - return timeSpentInSeconds; - } - - - /** - * Sets the timeSpentInSeconds value for this RemoteWorklog. - * - * @param timeSpentInSeconds - */ - public void setTimeSpentInSeconds(long timeSpentInSeconds) { - this.timeSpentInSeconds = timeSpentInSeconds; - } - - - /** - * Gets the updateAuthor value for this RemoteWorklog. - * - * @return updateAuthor - */ - public String getUpdateAuthor() { - return updateAuthor; - } - - - /** - * Sets the updateAuthor value for this RemoteWorklog. - * - * @param updateAuthor - */ - public void setUpdateAuthor(String updateAuthor) { - this.updateAuthor = updateAuthor; - } - - - /** - * Gets the updated value for this RemoteWorklog. - * - * @return updated - */ - public java.util.Calendar getUpdated() { - return updated; - } - - - /** - * Sets the updated value for this RemoteWorklog. - * - * @param updated - */ - public void setUpdated(java.util.Calendar updated) { - this.updated = updated; - } - - private Object __equalsCalc = null; - - public synchronized boolean equals(Object obj) { - if (!(obj instanceof RemoteWorklog)) { - return false; - } - RemoteWorklog other = (RemoteWorklog) obj; - if (obj == null) { - return false; - } - if (this == obj) { - return true; - } - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - ((this.author == null && other.getAuthor() == null) || - (this.author != null && - this.author.equals(other.getAuthor()))) && - ((this.comment == null && other.getComment() == null) || - (this.comment != null && - this.comment.equals(other.getComment()))) && - ((this.created == null && other.getCreated() == null) || - (this.created != null && - this.created.equals(other.getCreated()))) && - ((this.groupLevel == null && other.getGroupLevel() == null) || - (this.groupLevel != null && - this.groupLevel.equals(other.getGroupLevel()))) && - ((this.id == null && other.getId() == null) || - (this.id != null && - this.id.equals(other.getId()))) && - ((this.roleLevelId == null && other.getRoleLevelId() == null) || - (this.roleLevelId != null && - this.roleLevelId.equals(other.getRoleLevelId()))) && - ((this.startDate == null && other.getStartDate() == null) || - (this.startDate != null && - this.startDate.equals(other.getStartDate()))) && - ((this.timeSpent == null && other.getTimeSpent() == null) || - (this.timeSpent != null && - this.timeSpent.equals(other.getTimeSpent()))) && - this.timeSpentInSeconds == other.getTimeSpentInSeconds() && - ((this.updateAuthor == null && other.getUpdateAuthor() == null) || - (this.updateAuthor != null && - this.updateAuthor.equals(other.getUpdateAuthor()))) && - ((this.updated == null && other.getUpdated() == null) || - (this.updated != null && - this.updated.equals(other.getUpdated()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - if (getAuthor() != null) { - _hashCode += getAuthor().hashCode(); - } - if (getComment() != null) { - _hashCode += getComment().hashCode(); - } - if (getCreated() != null) { - _hashCode += getCreated().hashCode(); - } - if (getGroupLevel() != null) { - _hashCode += getGroupLevel().hashCode(); - } - if (getId() != null) { - _hashCode += getId().hashCode(); - } - if (getRoleLevelId() != null) { - _hashCode += getRoleLevelId().hashCode(); - } - if (getStartDate() != null) { - _hashCode += getStartDate().hashCode(); - } - if (getTimeSpent() != null) { - _hashCode += getTimeSpent().hashCode(); - } - _hashCode += new Long(getTimeSpentInSeconds()).hashCode(); - if (getUpdateAuthor() != null) { - _hashCode += getUpdateAuthor().hashCode(); - } - if (getUpdated() != null) { - _hashCode += getUpdated().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(RemoteWorklog.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://beans.soap.rpc.jira.atlassian.com", "RemoteWorklog")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("author"); - elemField.setXmlName(new javax.xml.namespace.QName("", "author")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("comment"); - elemField.setXmlName(new javax.xml.namespace.QName("", "comment")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("created"); - elemField.setXmlName(new javax.xml.namespace.QName("", "created")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "dateTime")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("groupLevel"); - elemField.setXmlName(new javax.xml.namespace.QName("", "groupLevel")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("id"); - elemField.setXmlName(new javax.xml.namespace.QName("", "id")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("roleLevelId"); - elemField.setXmlName(new javax.xml.namespace.QName("", "roleLevelId")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("startDate"); - elemField.setXmlName(new javax.xml.namespace.QName("", "startDate")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "dateTime")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("timeSpent"); - elemField.setXmlName(new javax.xml.namespace.QName("", "timeSpent")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("timeSpentInSeconds"); - elemField.setXmlName(new javax.xml.namespace.QName("", "timeSpentInSeconds")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("updateAuthor"); - elemField.setXmlName(new javax.xml.namespace.QName("", "updateAuthor")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("updated"); - elemField.setXmlName(new javax.xml.namespace.QName("", "updated")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "dateTime")); - elemField.setNillable(true); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - String mechType, - Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/idea/jira/CachedIconLoader.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/idea/jira/CachedIconLoader.java deleted file mode 100644 index 3961464dc80d..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/idea/jira/CachedIconLoader.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.idea.jira; - -import javax.swing.*; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -public final class CachedIconLoader { - private static Map<String, Icon> icons = new HashMap<String, Icon>(); - private static Map<String, Icon> disabledIcons = new HashMap<String, Icon>(); - - private CachedIconLoader() { - } - - public static Icon getDisabledIcon(String urlString) { - return disabledIcons.get(urlString); - } - - private static void addDisabledIcon(String urlString, Icon icon) { - disabledIcons.put(urlString, icon); - } - - private static Icon generateDisabledIcon(Icon icon) { - return new ImageIcon(GrayFilter.createDisabledImage(((ImageIcon) icon).getImage())); - } - - private static void maybeGenerateDisabledIcon(String urlString, Icon icon) { - if (disabledIcons.containsKey(urlString) || icon == null) { - return; - } - addDisabledIcon(urlString, generateDisabledIcon(icon)); - } - - public static Icon getIcon(URL url) { - if (url != null) { - String key = url.toString(); - if (!icons.containsKey(key)) { - Icon i = new ImageIcon(url); - icons.put(key, i); - maybeGenerateDisabledIcon(key, i); - } - return icons.get(key); - } else { - return null; - } - } - - public static Icon getIcon(String urlString) { - if (urlString != null) { - if (!icons.containsKey(urlString)) { - try { - URL url = new URL(urlString); - Icon i = new ImageIcon(url); - icons.put(urlString, i); - maybeGenerateDisabledIcon(urlString, i); - } catch (MalformedURLException e1) { - return null; - } - } - return icons.get(urlString); - } else { - return null; - } - } - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/AbstractJIRAConstantBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/AbstractJIRAConstantBean.java deleted file mode 100644 index 584446fbb67e..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/AbstractJIRAConstantBean.java +++ /dev/null @@ -1,73 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -public abstract class AbstractJIRAConstantBean implements JIRAConstant { - protected String name; - protected long id; - protected URL iconUrl = null; - - public AbstractJIRAConstantBean() { - } - - protected AbstractJIRAConstantBean(long id, String name, URL iconUrl) { - this.id = id; - this.name = name; - this.iconUrl = iconUrl; - } - - public AbstractJIRAConstantBean(Map<String, String> map) { - name = map.get("name"); - id = Long.valueOf(map.get("id")); - - if (map.containsKey("icon")) { - try { - iconUrl = new URL(map.get("icon")); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - } - } - - public HashMap<String, String> getMap() { - HashMap<String, String> map = new HashMap<String, String>(); - map.put("name", getName()); - map.put("id", Long.toString(id)); - if (iconUrl != null) { - map.put("icon", iconUrl.toString()); - } - map.put("filterTypeClass", this.getClass().getName()); - return map; - } - - public long getId() { - return id; - } - - public String getName() { - return name; - } - - public URL getIconUrl() { - return iconUrl; - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAAction.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAAction.java deleted file mode 100644 index c199259db0c8..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAAction.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -public interface JIRAAction extends JIRAConstant { -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAActionBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAActionBean.java deleted file mode 100644 index 6ec5d248c456..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAActionBean.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -public class JIRAActionBean extends AbstractJIRAConstantBean implements JIRAAction { - public JIRAActionBean(long id, String name) { - super(id, name, null); - } - - public JIRAActionBean(JIRAActionBean other) { - this(other.id, other.name); - } - - public String getQueryStringFragment() { - return "action=" + id; - } - - public JIRAActionBean getClone() { - return new JIRAActionBean(this); - } - - @Override - public String toString() { - return name; - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAActionField.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAActionField.java deleted file mode 100644 index c3dd25bd04d1..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAActionField.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -public interface JIRAActionField extends JIRAConstant { -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAActionFieldBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAActionFieldBean.java deleted file mode 100644 index 5f45b4955139..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAActionFieldBean.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -public class JIRAActionFieldBean extends AbstractJIRAConstantBean implements JIRAActionField { - private String fieldId; - - public JIRAActionFieldBean(String fieldId, String name) { - super(fieldId.hashCode(), name, null); - this.fieldId = fieldId; - } - - public JIRAActionFieldBean(JIRAActionFieldBean other) { - this(other.fieldId, other.name); - } - - public String getQueryStringFragment() { - // todo: I am almost absolutely sure this is wrong. Once we get - // to actually handling action fields, this will have to be fixed - return fieldId + "="; - } - - public JIRAActionFieldBean getClone() { - return new JIRAActionFieldBean(this); - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAAssigneeBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAAssigneeBean.java deleted file mode 100644 index 2853b39e4a30..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAAssigneeBean.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.util.Map; - -public class JIRAAssigneeBean extends JIRAUserBean { - public JIRAAssigneeBean() { - } - - public JIRAAssigneeBean(long id, String name, String value) { - super(id, name, value); - } - - public JIRAAssigneeBean(Map<String, String> map) { - super(map); - } - - public JIRAAssigneeBean(JIRAAssigneeBean other) { - this(other.getMap()); - } - - @Override - public String getQueryStringFragment() { - return "assignee=" + getValue(); - } - - public JIRAAssigneeBean getClone() { - return new JIRAAssigneeBean(this); - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAComment.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAComment.java deleted file mode 100644 index b5cab2ca9848..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAComment.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.util.Calendar; - -public interface JIRAComment { - String getId(); - String getAuthor(); - String getAuthorFullName(); - void setAuthorFullName(String author); - String getBody(); - Calendar getCreationDate(); -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRACommentBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRACommentBean.java deleted file mode 100644 index bd16466d3f64..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRACommentBean.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.util.Calendar; - -public class JIRACommentBean implements JIRAComment { - private String id; - private String author; - private String authorFullName; - private String body; - private Calendar created; - - public JIRACommentBean(String id, String author, String body, Calendar created) { - this.id = id; - this.author = author; - this.authorFullName = author; - this.body = body; - this.created = created; - } - public String getId() { - return id; - } - - public String getAuthor() { - return author; - } - - public void setAuthorFullName(String authorFullName) { - this.authorFullName = authorFullName; - } - - public String getAuthorFullName() { - return authorFullName; - } - - public String getBody() { - return body; - } - - public Calendar getCreationDate() { - return created; - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAComponentBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAComponentBean.java deleted file mode 100644 index 10412a118a3c..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAComponentBean.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.util.Map; - -public class JIRAComponentBean extends AbstractJIRAConstantBean { - public JIRAComponentBean(Map<String, String> map) { - super(map); - } - - public JIRAComponentBean(long id, String name) { - super(id, name, null); - } - - public JIRAComponentBean(JIRAComponentBean other) { - this(other.getMap()); - } - - // returns from this object a fragment of a query string that the IssueNavigator will understand - public String getQueryStringFragment() { - return "component=" + getId(); - } - - public JIRAComponentBean getClone() { - return new JIRAComponentBean(this); - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAConstant.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAConstant.java deleted file mode 100644 index 350b23049cd6..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAConstant.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.net.URL; - -public interface JIRAConstant extends JIRAQueryFragment { - URL getIconUrl(); -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAException.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAException.java deleted file mode 100644 index 1efc37ad8b2d..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAException.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -/** - * Generic Bamboo Excepion. - */ -public class JIRAException extends Exception { - - public JIRAException(String message) { - super(message); - } - - public JIRAException(String message, Throwable throwable) { - super(message, throwable); - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAFixForVersionBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAFixForVersionBean.java deleted file mode 100644 index 14a2f42601fb..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAFixForVersionBean.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.util.Map; - -public class JIRAFixForVersionBean extends JIRAVersionBean { - - public JIRAFixForVersionBean(Map<String, String> map) { - super(map); - } - - public JIRAFixForVersionBean(long id, String name) { - super(id, name); - } - - public JIRAFixForVersionBean(JIRAFixForVersionBean other) { - super(other.getId(), other.getName()); - } - public JIRAFixForVersionBean(JIRAVersionBean other) { - super(other.getId(), other.getName()); - } - - @Override - public String getQueryStringFragment() { - return "fixfor=" + getId(); - } - - @Override - public JIRAFixForVersionBean getClone() { - return new JIRAFixForVersionBean(this); - } - - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAIssue.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAIssue.java deleted file mode 100644 index 15e2af272316..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAIssue.java +++ /dev/null @@ -1,109 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.util.List; - -public interface JIRAIssue { - String getServerUrl(); - - String getProjectUrl(); - - String getIssueUrl(); - - Long getId(); - - String getKey(); - - String getProjectKey(); - - String getStatus(); - - String getStatusTypeUrl(); - - String getSummary(); - - String getType(); - - String getTypeIconUrl(); - - String getPriority(); - - String getPriorityIconUrl(); - - String getDescription(); - - JIRAConstant getTypeConstant(); - - JIRAConstant getStatusConstant(); - - JIRAConstant getPriorityConstant(); - - String getAssignee(); - - String getAssigneeId(); - - String getReporter(); - - String getReporterId(); - - String getResolution(); - - String getCreated(); - - String getUpdated(); - - boolean isSubTask(); - - String getParentIssueKey(); - - List<String> getSubTaskKeys(); - - long getPriorityId(); - - long getStatusId(); - - long getTypeId(); - - void setAssignee(String assignee); - - List<JIRAConstant> getAffectsVersions(); - - List<JIRAConstant> getFixVersions(); - - List<JIRAConstant> getComponents(); - - void setAffectsVersions(List<JIRAConstant> versions); - - void setFixVersions(List<JIRAConstant> versions); - - void setComponents(List<JIRAConstant> components); - - String getOriginalEstimate(); - - void setOriginalEstimate(String t); - - String getRemainingEstimate(); - - void setRemainingEstimate(String t); - - String getTimeSpent(); - - void setTimeSpent(String t); - - List<JIRAComment> getComments(); -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAIssueBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAIssueBean.java deleted file mode 100644 index 0d0736b20442..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAIssueBean.java +++ /dev/null @@ -1,487 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import org.jdom.Element; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.*; - -public class JIRAIssueBean implements JIRAIssue { - private String serverUrl; - private Long id; - private String key; - private String summary; - private String status; - private String statusUrl; - private String type; - private String typeUrl; - private String priority; - private String priorityUrl; - private String description; - private String projectKey; - private JIRAConstant statusConstant; - private JIRAConstant typeConstant; - private JIRAConstant priorityConstant; - private String assignee; - private String assigneeId; - private String reporter; - private String reporterId; - private String resolution; - private String created; - private String updated; - private long statusId; - private long priorityId; - private long typeId; - private List<JIRAConstant> affectsVersions; - private List<JIRAConstant> fixVersions; - private List<JIRAConstant> components; - - private List<String> subTaskList; - private boolean thisIsASubTask; - private String parentIssueKey; - private String originalEstimate; - private String remainingEstimate; - private String timeSpent; - private List<JIRAComment> commentsList; - - public JIRAIssueBean() { - } - - public JIRAIssueBean(String serverUrl) { - this.serverUrl = serverUrl; - } - - public JIRAIssueBean(JIRAIssue issue) { - serverUrl = issue.getServerUrl(); - id = issue.getId(); - key = issue.getKey(); - summary = issue.getSummary(); - status = issue.getStatus(); - statusUrl = issue.getStatusTypeUrl(); - type = issue.getType(); - typeUrl = issue.getTypeIconUrl(); - priority = issue.getPriority(); - priorityUrl = issue.getPriorityIconUrl(); - description = issue.getDescription(); - projectKey = issue.getProjectKey(); - statusConstant = issue.getStatusConstant(); - typeConstant = issue.getTypeConstant(); - priorityConstant = issue.getPriorityConstant(); - assignee = issue.getAssignee(); - assigneeId = issue.getAssigneeId(); - reporter = issue.getReporter(); - reporterId = issue.getReporterId(); - resolution = issue.getResolution(); - created = issue.getCreated(); - updated = issue.getUpdated(); - statusId = issue.getStatusId(); - priorityId = issue.getPriorityId(); - typeId = issue.getTypeId(); - thisIsASubTask = issue.isSubTask(); - subTaskList = issue.getSubTaskKeys(); - parentIssueKey = issue.getParentIssueKey(); - } - - public JIRAIssueBean(String serverUrl, Element e, boolean getComments) { - this.serverUrl = serverUrl; - this.summary = getTextSafely(e, "summary"); - this.key = getTextSafely(e, "key"); - this.id = new Long(getAttributeSafely(e, "key", "id")); - updateProjectKey(); - this.status = getTextSafely(e, "status"); - this.statusUrl = getAttributeSafely(e, "status", "iconUrl"); - try { - this.statusId = Long.parseLong(getAttributeSafely(e, "status", "id")); - } catch (NumberFormatException ex) { - this.statusId = 0; - } - this.priority = getTextSafely(e, "priority"); - this.priorityUrl = getAttributeSafely(e, "priority", "iconUrl"); - try { - this.priorityId = Long.parseLong(getAttributeSafely(e, "priority", "id")); - } catch (NumberFormatException ex) { - this.priorityId = 0; - } - this.description = getTextSafely(e, "description"); - this.type = getTextSafely(e, "type"); - this.typeUrl = getAttributeSafely(e, "type", "iconUrl"); - try { - this.typeId = Long.parseLong(getAttributeSafely(e, "type", "id")); - } catch (NumberFormatException ex) { - this.typeId = 0; - } - this.assignee = getTextSafely(e, "assignee"); - this.assigneeId = getAttributeSafely(e, "assignee", "username"); - this.reporter = getTextSafely(e, "reporter"); - this.reporterId = getAttributeSafely(e, "reporter", "username"); - this.created = getTextSafely(e, "created"); - this.updated = getTextSafely(e, "updated"); - this.resolution = getTextSafely(e, "resolution"); - - this.parentIssueKey = getTextSafely(e, "parent"); - this.thisIsASubTask = parentIssueKey != null; - subTaskList = new ArrayList<String>(); - Element subtasks = e.getChild("subtasks"); - if (subtasks != null) { - for (Object subtask : subtasks.getChildren("subtask")) { - String subTaskKey = ((Element) subtask).getText(); - if (subTaskKey != null) { - subTaskList.add(subTaskKey); - } - } - } - - this.originalEstimate = getTextSafely(e, "timeoriginalestimate"); - this.remainingEstimate = getTextSafely(e, "timeestimate"); - this.timeSpent = getTextSafely(e, "timespent"); - - Element comments = e.getChild("comments"); - if (comments != null && getComments) { - commentsList = new ArrayList<JIRAComment>(); - for (Object comment : comments.getChildren("comment")) { - Element el = (Element) comment; - String commentId = el.getAttributeValue("id", "-1"); - String author = el.getAttributeValue("author", "Unknown"); - String text = el.getText(); - String creationDate = el.getAttributeValue("created", "Unknown"); - - Calendar cal = Calendar.getInstance(); - DateFormat df = new SimpleDateFormat("EEE MMM d HH:mm:ss Z yyyy", Locale.US); - try { - cal.setTime(df.parse(creationDate)); - } catch (java.text.ParseException ex) { - // oh well, invalid time - now what? :( - } - - commentsList.add(new JIRACommentBean(commentId, author, text, cal)); - } - } - } - - public JIRAConstant getPriorityConstant() { - return priorityConstant; - } - - public void setPriority(JIRAConstant priority) { - this.priority = priority.getName(); - this.priorityConstant = priority; - } - - public JIRAIssueBean(String serverUrl, Map params) { - this.serverUrl = serverUrl; - this.summary = (String) params.get("summary"); - this.status = (String) params.get("status"); - this.key = (String) params.get("key"); - this.id = new Long(params.get("key").toString()); - updateProjectKey(); - this.description = (String) params.get("description"); - this.type = (String) params.get("type"); - this.priority = (String) params.get("priority"); - } - - private void updateProjectKey() { - if (key != null) { - if (key.indexOf("-") >= 0) { - projectKey = key.substring(0, key.indexOf("-")); - } else { - projectKey = key; - } - } - } - - private String getTextSafely(Element e, String name) { - Element child = e.getChild(name); - - if (child == null) { - return null; - } - - return child.getText(); - } - - private String getAttributeSafely(Element e, String elementName, String attributeName) { - Element child = e.getChild(elementName); - - if (child == null || child.getAttribute(attributeName) == null) { - return null; - } - - return child.getAttributeValue(attributeName); - } - - public String getServerUrl() { - return serverUrl; - } - - public void setServerUrl(String serverUrl) { - this.serverUrl = serverUrl; - } - - public String getProjectUrl() { - return serverUrl + "/browse/" + getProjectKey(); - } - - public String getIssueUrl() { - return serverUrl + "/browse/" + getKey(); - } - - public Long getId() { - return id; - } - - public boolean isSubTask() { - return thisIsASubTask; - } - - public String getParentIssueKey() { - return parentIssueKey; - } - - public List<String> getSubTaskKeys() { - return subTaskList; - } - - public String getProjectKey() { - return projectKey; - } - - public String getStatus() { - return status; - } - - public String getStatusTypeUrl() { - return statusUrl; - } - - public String getPriority() { - return priority; - } - - public String getPriorityIconUrl() { - return priorityUrl; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getSummary() { - return summary; - } - - public String getType() { - return type; - } - - public String getTypeIconUrl() { - return typeUrl; - } - - public void setTypeIconUrl(String newTypeUrl) { - this.typeUrl = newTypeUrl; - } - - public String getDescription() { - return description; - } - - public void setSummary(String summary) { - this.summary = summary; - } - - public void setProjectKey(String projectKey) { - this.projectKey = projectKey; - } - - public void setDescription(String description) { - this.description = description; - } - - public JIRAConstant getTypeConstant() { - return typeConstant; - } - - public void setType(JIRAConstant type) { - this.type = type.getName(); - this.typeConstant = type; - } - - public JIRAConstant getStatusConstant() { - return statusConstant; - } - - public void setStatus(JIRAConstant status) { - this.status = status.getName(); - this.statusConstant = status; - } - - public String getAssignee() { - return assignee; - } - - public void setAssignee(String assignee) { - this.assignee = assignee; - } - - public long getPriorityId() { - return priorityId; - } - - public long getStatusId() { - return statusId; - } - - public long getTypeId() { - return typeId; - } - - public String getReporter() { - return reporter; - } - - public void setReporter(String reporter) { - this.reporter = reporter; - } - - public String getResolution() { - return resolution; - } - - public void setResolution(String resolution) { - this.resolution = resolution; - } - - public String getCreated() { - return created; - } - - public void setCreated(String created) { - this.created = created; - } - - public String getUpdated() { - return updated; - } - - public void setUpdated(String updated) { - this.updated = updated; - } - - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - JIRAIssueBean that = (JIRAIssueBean) o; - - if (key != null ? !key.equals(that.key) : that.key != null) { - return false; - } - if (serverUrl != null ? !serverUrl.equals(that.serverUrl) : that.serverUrl != null) { - return false; - } - return !(summary != null ? !summary.equals(that.summary) : that.summary != null); - - } - - private static final int ONE_EFF = 31; - - public int hashCode() { - int result; - result = (serverUrl != null ? serverUrl.hashCode() : 0); - result = ONE_EFF * result + (key != null ? key.hashCode() : 0); - result = ONE_EFF * result + (summary != null ? summary.hashCode() : 0); - return result; - } - - public String getAssigneeId() { - return assigneeId; - } - - public void setAssigneeId(String assigneeId) { - this.assigneeId = assigneeId; - } - - public String getReporterId() { - return reporterId; - } - - public void setReporterId(String reporterId) { - this.reporterId = reporterId; - } - - public List<JIRAConstant> getAffectsVersions() { - return affectsVersions; - } - - public void setAffectsVersions(List<JIRAConstant> affectsVersions) { - this.affectsVersions = affectsVersions; - } - - public List<JIRAConstant> getFixVersions() { - return fixVersions; - } - - public void setFixVersions(List<JIRAConstant> fixVersions) { - this.fixVersions = fixVersions; - } - - public List<JIRAConstant> getComponents() { - return components; - } - - public void setComponents(List<JIRAConstant> components) { - this.components = components; - } - - public String getOriginalEstimate() { - return originalEstimate; - } - - public void setOriginalEstimate(String originalEstimate) { - this.originalEstimate = originalEstimate; - } - - public String getRemainingEstimate() { - return remainingEstimate; - } - - public void setRemainingEstimate(String remainingEstimate) { - this.remainingEstimate = remainingEstimate; - } - - public String getTimeSpent() { - return timeSpent; - } - - public void setTimeSpent(String timeSpent) { - this.timeSpent = timeSpent; - } - - public List<JIRAComment> getComments() { - return commentsList; - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAIssueTypeBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAIssueTypeBean.java deleted file mode 100644 index 558ed3cf9ab1..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAIssueTypeBean.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.net.URL; -import java.util.Map; - -public class JIRAIssueTypeBean extends AbstractJIRAConstantBean { - private boolean subTask = false; - public JIRAIssueTypeBean(Map<String, String> map) { - super(map); - subTask = Boolean.valueOf(map.get("subTask")); - } - - public JIRAIssueTypeBean(long id, String name, URL iconUrl) { - super(id, name, iconUrl); - } - - public JIRAIssueTypeBean(JIRAIssueTypeBean other) { - this(other.getMap()); - } - - public String getQueryStringFragment() { - return "type=" + getId(); - } - - public JIRAIssueTypeBean getClone() { - return new JIRAIssueTypeBean(this); - } - - public boolean isSubTask() { - return subTask; - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRALoginException.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRALoginException.java deleted file mode 100644 index 6fca949e0018..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRALoginException.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -/** - * Generic Bamboo Excepion. - */ -public class JIRALoginException extends JIRAException { - - public JIRALoginException(String message) { - super(message); - } - - public JIRALoginException(String message, Throwable throwable) { - super(message, throwable); - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAPriorityBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAPriorityBean.java deleted file mode 100644 index 226f9af152d0..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAPriorityBean.java +++ /dev/null @@ -1,44 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.net.URL; -import java.util.Map; - -public class JIRAPriorityBean extends AbstractJIRAConstantBean { - public JIRAPriorityBean(Map<String, String> map) { - super(map); - } - - public JIRAPriorityBean(long id, String name, URL iconUrl) { - super(id, name, iconUrl); - } - - public JIRAPriorityBean(JIRAPriorityBean other) { - super(other.getMap()); - } - - public String getQueryStringFragment() { - return "priority=" + getId(); - } - - public JIRAPriorityBean getClone() { - return new JIRAPriorityBean(this); - } - - -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAProject.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAProject.java deleted file mode 100644 index ea3b4946e671..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAProject.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -public interface JIRAProject extends JIRAQueryFragment { - String getKey(); - - String getUrl(); - - String getLead(); - - String getDescription(); -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAProjectBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAProjectBean.java deleted file mode 100644 index edcb5a592398..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAProjectBean.java +++ /dev/null @@ -1,121 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import com.intellij.util.xmlb.annotations.Transient; - -import java.util.HashMap; -import java.util.Map; - -public class JIRAProjectBean implements JIRAProject { - private String name; - private String key; - private String url; - private long id; - private String description; - private String lead; - - public JIRAProjectBean() { - } - - public JIRAProjectBean(Map projMap) { - name = (String) projMap.get("name"); - key = (String) projMap.get("key"); - description = (String) projMap.get("description"); - url = (String) projMap.get("url"); - lead = (String) projMap.get("lead"); - id = Long.valueOf((String) projMap.get("id")); - } - - public JIRAProjectBean(long id, String name) { - this.id = id; - this.name = name; - } - - public JIRAProjectBean(JIRAProjectBean other) { - this(other.getMap()); - } - - public String getName() { - return name; - } - - public HashMap<String, String> getMap() { - HashMap<String, String> map = new HashMap<String, String>(); - map.put("name", getName()); - map.put("id", Long.toString(id)); - map.put("key", getKey()); - map.put("description", getDescription()); - map.put("url", getUrl()); - map.put("lead", getLead()); - map.put("filterTypeClass", this.getClass().getName()); - return map; - } - - public JIRAProjectBean getClone() { - return new JIRAProjectBean(this); - } - - public String getKey() { - return key; - } - - public String getUrl() { - return url; - } - - public long getId() { - return id; - } - - public String getDescription() { - return description; - } - - public String getLead() { - return lead; - } - - @Transient - public String getQueryStringFragment() { - return "pid=" + id; - } - - public void setName(String name) { - this.name = name; - } - - public void setKey(String key) { - this.key = key; - } - - public void setUrl(String url) { - this.url = url; - } - - public void setId(long id) { - this.id = id; - } - - public void setDescription(String description) { - this.description = description; - } - - public void setLead(String lead) { - this.lead = lead; - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAQueryFragment.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAQueryFragment.java deleted file mode 100644 index 72ba7e311663..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAQueryFragment.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.util.HashMap; - -public interface JIRAQueryFragment { - String getQueryStringFragment(); - - long getId(); - - String getName(); - - HashMap<String, String> getMap(); - - JIRAQueryFragment getClone(); -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAReporterBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAReporterBean.java deleted file mode 100644 index 8e243a982ef7..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAReporterBean.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.util.Map; - -public class JIRAReporterBean extends JIRAUserBean { - public JIRAReporterBean() { - } - - public JIRAReporterBean(long id, String name, String value) { - super(id, name, value); - } - - public JIRAReporterBean(Map<String, String> map) { - super(map); - } - - public JIRAReporterBean(JIRAReporterBean other) { - this(other.getMap()); - } - - @Override - public String getQueryStringFragment() { - return "reporter=" + getValue(); - } - - public JIRAReporterBean getClone() { - return new JIRAReporterBean(this); - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAResolutionBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAResolutionBean.java deleted file mode 100644 index cbf9bbfe22ed..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAResolutionBean.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.util.Map; - -public class JIRAResolutionBean extends AbstractJIRAConstantBean { - - public JIRAResolutionBean(Map<String, String> map) { - super(map); - } - - public JIRAResolutionBean(long id, String name) { - super(id, name, null); - } - - public JIRAResolutionBean(JIRAResolutionBean other) { - this(other.getMap()); - } - - public String getQueryStringFragment() { - return "resolution=" + id; - } - - public JIRAResolutionBean getClone() { - return new JIRAResolutionBean(this); - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRASavedFilter.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRASavedFilter.java deleted file mode 100644 index 42085fee0699..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRASavedFilter.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -public interface JIRASavedFilter extends JIRAQueryFragment { - String getAuthor(); - - String getProject(); -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRASavedFilterBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRASavedFilterBean.java deleted file mode 100644 index eec04110c4d4..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRASavedFilterBean.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.util.HashMap; -import java.util.Map; - -public class JIRASavedFilterBean implements JIRASavedFilter { - private String name; - private String author; - private String project; - private long id; - - public JIRASavedFilterBean(Map projMap) { - name = (String) projMap.get("name"); - author = (String) projMap.get("author"); - project = (String) projMap.get("project"); - id = Long.valueOf((String) projMap.get("id")); - } - - public JIRASavedFilterBean(String n, long id) { - name = n; - this.id = id; - } - - public JIRASavedFilterBean(JIRASavedFilterBean other) { - this(other.getMap()); - } - - public String getName() { - return name; - } - - public HashMap<String, String> getMap() { - HashMap<String, String> map = new HashMap<String, String>(); - map.put("name", getName()); - map.put("id", Long.toString(id)); - map.put("author", getAuthor()); - map.put("project", getProject()); - map.put("filterTypeClass", this.getClass().getName()); - return map; - } - - public JIRASavedFilterBean getClone() { - return new JIRASavedFilterBean(this); - } - - public long getId() { - return id; - } - - public String getAuthor() { - return author; - } - - public String getProject() { - return project; - } - - public String getQueryStringFragment() { - return Long.toString(id); - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAStatusBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAStatusBean.java deleted file mode 100644 index 0b2f54dc9a80..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAStatusBean.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.net.URL; -import java.util.Map; - -public class JIRAStatusBean extends AbstractJIRAConstantBean { - public JIRAStatusBean(Map<String, String> map) { - super(map); - } - - public JIRAStatusBean(long id, String name, URL iconUrl) { - super(id, name, iconUrl); - } - - public JIRAStatusBean(JIRAStatusBean other) { - this(other.getMap()); - } - - public String getQueryStringFragment() { - return "status=" + getId(); - } - - public JIRAStatusBean getClone() { - return new JIRAStatusBean(this); - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAUserBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAUserBean.java deleted file mode 100644 index 6bff3e925994..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAUserBean.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.util.HashMap; -import java.util.Map; - -public abstract class JIRAUserBean extends AbstractJIRAConstantBean { - protected String value = ""; - - public JIRAUserBean() { - super(); - } - - public JIRAUserBean(long id, String name, String value) { - super(id, name, null); - this.value = value; - } - - public JIRAUserBean(Map<String, String> map) { - super(map); - value = map.get("value"); - } - - public HashMap<String, String> getMap() { - HashMap<String, String> map = super.getMap(); - map.put("value", getValue()); - return map; - } - - public String getValue() { - return value; - } - - public abstract String getQueryStringFragment(); -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAVersionBean.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAVersionBean.java deleted file mode 100644 index d1703860fcf9..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JIRAVersionBean.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Copyright (C) 2008 Atlassian - * - * 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.atlassian.theplugin.jira.api; - -import java.util.Map; - -public class JIRAVersionBean extends AbstractJIRAConstantBean { - protected boolean isReleased; - - public JIRAVersionBean(Map<String, String> map) { - super(map); - isReleased = Boolean.valueOf(map.get("released")); - } - - public JIRAVersionBean(long id, String name) { - this.id = id; - this.name = name; - } - - public JIRAVersionBean(JIRAVersionBean other) { - this(other.getMap()); - } - - public boolean isReleased() { - return isReleased; - } - - public void setReleased(boolean released) { - isReleased = released; - } - - public String getQueryStringFragment() { - return "version=" + getId(); - } - - public JIRAVersionBean getClone() { - return new JIRAVersionBean(this); - } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JiraUserNotFoundException.java b/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JiraUserNotFoundException.java deleted file mode 100644 index b7f1504a42a3..000000000000 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/theplugin/jira/api/JiraUserNotFoundException.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.atlassian.theplugin.jira.api; - -/** - * User: jgorycki - * Date: Dec 8, 2008 - * Time: 6:22:09 PM - */ -public class JiraUserNotFoundException extends Exception { - public JiraUserNotFoundException(String message) { super(message); } -} diff --git a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/jirasoapservice-v2.wsdl b/plugins/tasks/tasks-core/jira/jirasoapservice-v2.wsdl index de43b2c4fcf0..de43b2c4fcf0 100644 --- a/plugins/tasks/tasks-core/jira/gen/com/atlassian/connector/commons/jira/soap/axis/jirasoapservice-v2.wsdl +++ b/plugins/tasks/tasks-core/jira/jirasoapservice-v2.wsdl diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepository.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepository.java index 90a313d76cf1..680d396757ac 100644 --- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepository.java +++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepository.java @@ -10,6 +10,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.tasks.LocalTask; import com.intellij.tasks.Task; +import com.intellij.tasks.TaskBundle; import com.intellij.tasks.TaskState; import com.intellij.tasks.impl.BaseRepositoryImpl; import com.intellij.tasks.impl.TaskUtil; @@ -21,6 +22,7 @@ import org.apache.commons.httpclient.Header; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.HttpStatus; +import org.apache.commons.httpclient.cookie.CookiePolicy; import org.apache.commons.httpclient.methods.GetMethod; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,15 +36,16 @@ import java.io.InputStream; public class JiraRepository extends BaseRepositoryImpl { public static final Gson GSON = TaskUtil.installDateDeserializer(new GsonBuilder()).create(); - private final static Logger LOG = Logger.getInstance("#com.intellij.tasks.jira.JiraRepository"); - // TODO: move to bundle - public static final String LOGIN_FAILED_CHECK_YOUR_PERMISSIONS = "Login failed. Check your permissions."; + private final static Logger LOG = Logger.getInstance(JiraRepository.class); public static final String REST_API_PATH = "/rest/api/latest"; + private static final boolean DEBUG_SOAP = Boolean.getBoolean("tasks.jira.soap"); + private static final boolean REDISCOVER_API = Boolean.getBoolean("tasks.jira.rediscover"); + /** * Default JQL query */ - private String mySearchQuery = "assignee = currentUser() and resolution = Unresolved order by updated"; + private String mySearchQuery = TaskBundle.message("jira.default.query"); private JiraRemoteApi myApiVersion; @@ -79,14 +82,19 @@ public class JiraRepository extends BaseRepositoryImpl { public Task[] getIssues(@Nullable String query, int max, long since) throws Exception { ensureApiVersionDiscovered(); - String jqlQuery = mySearchQuery; - if (StringUtil.isNotEmpty(mySearchQuery) && StringUtil.isNotEmpty(query)) { - jqlQuery = String.format("summary ~ '%s' and ", query) + mySearchQuery; - } - else if (StringUtil.isNotEmpty(query)) { - jqlQuery = String.format("summary ~ '%s'", query); + String resultQuery = query; + if (isJqlSupported()) { + if (StringUtil.isNotEmpty(mySearchQuery) && StringUtil.isNotEmpty(query)) { + resultQuery = String.format("summary ~ '%s' and ", query) + mySearchQuery; + } + else if (StringUtil.isNotEmpty(query)) { + resultQuery = String.format("summary ~ '%s'", query); + } + else { + resultQuery = mySearchQuery; + } } - return ArrayUtil.toObjectArray(myApiVersion.findTasks(jqlQuery, max), Task.class); + return ArrayUtil.toObjectArray(myApiVersion.findTasks(resultQuery, max), Task.class); } @Nullable @@ -104,7 +112,7 @@ public class JiraRepository extends BaseRepositoryImpl { @Nullable @Override public CancellableConnection createCancellableConnection() { - // TODO cancellable connection for SOAP? + // TODO cancellable connection for XML_RPC? return new CancellableConnection() { @Override protected void doTest() throws Exception { @@ -121,6 +129,10 @@ public class JiraRepository extends BaseRepositoryImpl { @NotNull public JiraRemoteApi discoverApiVersion() throws Exception { + if (DEBUG_SOAP) { + return new JiraSoapApi(this); + } + String responseBody; GetMethod method = new GetMethod(getRestUrl("serverInfo")); try { @@ -128,8 +140,8 @@ public class JiraRepository extends BaseRepositoryImpl { } catch (Exception e) { // probably JIRA version prior 4.2 - // without isRequestSent() getStatusCode() might throw NPE, if connection was refused - if (method.isRequestSent() && method.getStatusCode() == HttpStatus.SC_NOT_FOUND) { + // without hasBeenUsed() check getStatusCode() might throw NPE, if connection was refused + if (method.hasBeenUsed() && method.getStatusCode() == HttpStatus.SC_NOT_FOUND) { return new JiraSoapApi(this); } else { @@ -141,19 +153,18 @@ public class JiraRepository extends BaseRepositoryImpl { // may be used instead version string parsing JiraRestApi restApi = JiraRestApi.fromJiraVersion(object.get("version").getAsString(), this); if (restApi == null) { - throw new Exception("JIRA below 4.2.0 doesn't have REST API and is no longer supported."); + throw new Exception(TaskBundle.message("jira.failure.no.REST")); } return restApi; - //return new JiraSoapApi(this); } private void ensureApiVersionDiscovered() throws Exception { - if (myApiVersion == null) { + if (myApiVersion == null || DEBUG_SOAP || REDISCOVER_API) { myApiVersion = discoverApiVersion(); } } - // Used primarily for SOAP API + // Used primarily for XML_RPC API @NotNull public String executeMethod(@NotNull HttpMethod method) throws Exception { return executeMethod(getHttpClient(), method); @@ -184,7 +195,7 @@ public class JiraRepository extends BaseRepositoryImpl { String reason = StringUtil.join(object.getAsJsonArray("errorMessages"), " "); // something meaningful to user, e.g. invalid field name in JQL query LOG.warn(reason); - throw new Exception("Request failed. Reason: " + reason); + throw new Exception(TaskBundle.message("failure.server.message", reason)); } } } @@ -192,24 +203,15 @@ public class JiraRepository extends BaseRepositoryImpl { Header header = method.getResponseHeader("X-Authentication-Denied-Reason"); // only in JIRA >= 5.x.x if (header.getValue().startsWith("CAPTCHA_CHALLENGE")) { - throw new Exception("Login failed. Enter captcha in web-interface."); + throw new Exception(TaskBundle.message("jira.failure.captcha")); } } if (statusCode == HttpStatus.SC_UNAUTHORIZED) { - throw new Exception(LOGIN_FAILED_CHECK_YOUR_PERMISSIONS); + throw new Exception(TaskBundle.message("failure.login")); } String statusText = HttpStatus.getStatusText(method.getStatusCode()); - throw new Exception(String.format("Request failed with HTTP error: %d %s", statusCode, statusText)); - } - - /* - @Override - protected void configureHttpClient(HttpClient client) { - super.configureHttpClient(client); - // TODO: is it really necessary? - client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY); + throw new Exception(TaskBundle.message("failure.http.error", statusCode, statusText)); } - */ // Made public for SOAP API compatibility @Override @@ -226,14 +228,24 @@ public class JiraRepository extends BaseRepositoryImpl { } @Override + protected void configureHttpClient(HttpClient client) { + super.configureHttpClient(client); + client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY); + } + + @Override protected int getFeatures() { int features = super.getFeatures() | TIME_MANAGEMENT; - if (myApiVersion == null || myApiVersion.getType() != JiraRemoteApi.ApiType.REST_2_0) { + if (myApiVersion == null || myApiVersion.getType() == JiraRemoteApi.ApiType.SOAP) { return features & ~NATIVE_SEARCH & ~STATE_UPDATING & ~TIME_MANAGEMENT; } return features; } + public boolean isJqlSupported() { + return myApiVersion != null && myApiVersion.getType() != JiraRemoteApi.ApiType.SOAP; + } + public String getSearchQuery() { return mySearchQuery; } @@ -250,7 +262,7 @@ public class JiraRepository extends BaseRepositoryImpl { @Override public void setUrl(String url) { // reset remote API version, only if server URL was changed - if (!getUrl().equals(url)) { + if (!getUrl().equals(url)) { myApiVersion = null; super.setUrl(url); } @@ -258,12 +270,13 @@ public class JiraRepository extends BaseRepositoryImpl { /** * Used to preserve discovered API version for the next initialization. + * * @return */ @SuppressWarnings("UnusedDeclaration") @Nullable public JiraRemoteApi.ApiType getApiType() { - return myApiVersion == null? null : myApiVersion.getType(); + return myApiVersion == null ? null : myApiVersion.getType(); } @SuppressWarnings("UnusedDeclaration") diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepositoryEditor.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepositoryEditor.java index e4bb9ae920a7..3299ac427432 100644 --- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepositoryEditor.java +++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepositoryEditor.java @@ -16,7 +16,7 @@ package com.intellij.tasks.jira; import com.intellij.openapi.project.Project; -import com.intellij.tasks.TaskRepository; +import com.intellij.tasks.TaskBundle; import com.intellij.tasks.config.BaseRepositoryEditor; import com.intellij.tasks.jira.jql.JqlLanguage; import com.intellij.ui.EditorTextField; @@ -62,7 +62,7 @@ public class JiraRepositoryEditor extends BaseRepositoryEditor<JiraRepository> { enableJqlSearchIfSupported(); installListener(mySearchQueryField); mySearchLabel = new JBLabel("Search:", SwingConstants.RIGHT); - JBLabel note = new JBLabel("JQL search is supported only for JIRA version >= 4.2"); + JBLabel note = new JBLabel(TaskBundle.message("jira.failure.no.JQL")); note.setComponentStyle(UIUtil.ComponentStyle.SMALL); return FormBuilder.createFormBuilder() .addLabeledComponent(mySearchLabel, mySearchQueryField) @@ -77,6 +77,6 @@ public class JiraRepositoryEditor extends BaseRepositoryEditor<JiraRepository> { } private void enableJqlSearchIfSupported() { - mySearchQueryField.setEnabled(myRepository.isSupported(TaskRepository.NATIVE_SEARCH)); + mySearchQueryField.setEnabled(myRepository.isJqlSupported()); } } diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraTask.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraTask.java index df1d28aa44d1..bbf20dccabed 100644 --- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraTask.java +++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraTask.java @@ -11,7 +11,7 @@ import java.util.Date; /** * Base class containing common interpretation of issues object's fields in - * JIRA's SOAP and REST interfaces. + * JIRA's XML-RPC and REST interfaces. * * @author Mikhail Golubev */ @@ -52,7 +52,9 @@ public abstract class JiraTask extends Task { public abstract Date getCreated(); @Override - public abstract String getIssueUrl(); + public final String getIssueUrl() { + return myRepository.getUrl() + "/browse/" + getId(); + } @Override @NotNull diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/rest/JiraRestTask.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/rest/JiraRestTask.java index b4c527a01e15..5eab2efece44 100644 --- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/rest/JiraRestTask.java +++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/rest/JiraRestTask.java @@ -65,26 +65,24 @@ public class JiraRestTask extends JiraTask { public Comment[] getComments() { return ContainerUtil.map2Array(myJiraIssue.getComments(), Comment.class, new Function<JiraComment, Comment>() { @Override - public Comment fun(JiraComment comment) { - final JiraComment comment1 = comment; + public Comment fun(final JiraComment comment) { return new Comment() { - private final JiraComment myComment = comment1; public String getText() { - return myComment.getBody(); + return comment.getBody(); } public String getAuthor() { - return myComment.getAuthor().getDisplayName(); + return comment.getAuthor().getDisplayName(); } public Date getDate() { - return myComment.getCreated(); + return comment.getCreated(); } @Override public String toString() { - return myComment.getAuthor().getDisplayName(); + return comment.getAuthor().getDisplayName(); } }; } @@ -120,11 +118,6 @@ public class JiraRestTask extends JiraTask { return myJiraIssue.getCreated(); } - @Override - public String getIssueUrl() { - return myRepository.getUrl() + "/browse/" + myJiraIssue.getKey(); - } - public JiraIssue getJiraIssue() { return myJiraIssue; } diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/rest/api20alpha1/JiraRestApi20Alpha1.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/rest/api20alpha1/JiraRestApi20Alpha1.java index d48cea8712d6..da3bb788de4f 100644 --- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/rest/api20alpha1/JiraRestApi20Alpha1.java +++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/rest/api20alpha1/JiraRestApi20Alpha1.java @@ -3,6 +3,7 @@ package com.intellij.tasks.jira.rest.api20alpha1; import com.google.gson.reflect.TypeToken; import com.intellij.openapi.diagnostic.Logger; import com.intellij.tasks.LocalTask; +import com.intellij.tasks.TaskBundle; import com.intellij.tasks.TaskState; import com.intellij.tasks.jira.JiraRepository; import com.intellij.tasks.jira.rest.JiraRestApi; @@ -18,7 +19,7 @@ import java.util.ArrayList; import java.util.List; /** - * This REST API is used in JIRA 4.3.4 and 4.4.1. + * This REST API is used in JIRA versions from 4.2 to 4.4. * @author Mikhail Golubev */ public class JiraRestApi20Alpha1 extends JiraRestApi { @@ -72,7 +73,7 @@ public class JiraRestApi20Alpha1 extends JiraRestApi { @Override public void updateTimeSpend(LocalTask task, String timeSpent, String comment) throws Exception { - throw new Exception(String.format("This version of JIRA REST API (%s) doesn't support updating worklog items.", getVersionName())); + throw new Exception(TaskBundle.message("jira.failure.no.state.update")); } @NotNull diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/soap/JiraSoapApi.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/soap/JiraSoapApi.java index f710f1d4ae11..9a6ddb19df1a 100644 --- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/soap/JiraSoapApi.java +++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/soap/JiraSoapApi.java @@ -1,34 +1,24 @@ package com.intellij.tasks.jira.soap; -import com.atlassian.connector.commons.jira.soap.axis.JiraSoapService; -import com.atlassian.connector.commons.jira.soap.axis.JiraSoapServiceServiceLocator; -import com.atlassian.theplugin.jira.api.JIRAIssueBean; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.util.KeyValue; import com.intellij.tasks.LocalTask; import com.intellij.tasks.Task; +import com.intellij.tasks.TaskBundle; import com.intellij.tasks.TaskState; import com.intellij.tasks.impl.TaskUtil; import com.intellij.tasks.jira.JiraRemoteApi; import com.intellij.tasks.jira.JiraRepository; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.net.HttpConfigurable; -import org.apache.axis.AxisProperties; -import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpStatus; -import org.apache.commons.httpclient.cookie.CookiePolicy; +import org.apache.commons.httpclient.NameValuePair; import org.apache.commons.httpclient.methods.GetMethod; -import org.apache.commons.httpclient.methods.PostMethod; import org.jdom.Element; import org.jdom.input.SAXBuilder; +import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.rmi.RemoteException; import java.util.List; /** @@ -39,7 +29,9 @@ import java.util.List; public class JiraSoapApi extends JiraRemoteApi { private static final Logger LOG = Logger.getInstance(JiraSoapApi.class); - private boolean myJira4 = true; + + @NonNls private static final String RSS_SEARCH_PATH = "/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml"; + public static final String RSS_ISSUE_PATH = "/si/jira.issueviews:issue-xml/"; public JiraSoapApi(@NotNull JiraRepository repository) { super(repository); @@ -48,36 +40,40 @@ public class JiraSoapApi extends JiraRemoteApi { @NotNull @Override public List<Task> findTasks(String query, int max) throws Exception { - StringBuilder url = new StringBuilder(myRepository.getUrl()); - url.append("/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?"); - url.append("tempMax=").append(max); - url.append("&assignee=").append(TaskUtil.encodeUrl(myRepository.getUsername())); - url.append("&reset=true"); - url.append("&sorter/field=updated"); - url.append("&sorter/order=DESC"); - url.append("&pager/start=0"); - return processRSS(url.toString(), login()); - } - private List<Task> processRSS(String url, HttpClient client) throws Exception { - GetMethod method = new GetMethod(url); - client.executeMethod(method); + // Unfortunately, both SOAP and XML-RPC interfaces of JIRA don't allow fetching *all* tasks from server, but + // only filtered by some search term (see http://stackoverflow.com/questions/764282/how-can-jira-soap-api-not-have-this-method). + // JQL was added in SOAP only since JIRA 4.0 (see method JiraSoapService#getIssuesFromJqlSearch() at + // https://docs.atlassian.com/software/jira/docs/api/rpc-jira-plugin/latest/index.html?com/atlassian/jira/rpc/soap/JiraSoapService.html) + // So due to this limitation and the need to support these old versions of bug tracker (3.0, 4.2) we need the following ugly and hacky + // solution with extracting issues from RSS feed. + + GetMethod method = new GetMethod(myRepository.getUrl() + RSS_SEARCH_PATH); + method.setQueryString(new NameValuePair[] { + new NameValuePair("tempMax", String.valueOf(max)), + new NameValuePair("assignee", TaskUtil.encodeUrl(myRepository.getUsername())), + new NameValuePair("reset", "true"), + new NameValuePair("sorter/field", "updated"), + new NameValuePair("sorter/order", "DESC"), + new NameValuePair("pager/start", "0") + }); + return processRSS(method); + } - int code = method.getStatusCode(); + private List<Task> processRSS(@NotNull GetMethod method) throws Exception { + // Basic authorization should be enough + int code = myRepository.getHttpClient().executeMethod(method); if (code != HttpStatus.SC_OK) { - throw new IOException(code == HttpStatus.SC_BAD_REQUEST ? - method.getResponseBodyAsString() : - ("HTTP " + code + " (" + HttpStatus.getStatusText(code) + ") " + method.getStatusText())); + throw new Exception(TaskBundle.message("failure.http.error", code, method.getStatusText())); } - InputStream stream = method.getResponseBodyAsStream(); - Element root = new SAXBuilder(false).build(stream).getRootElement(); + Element root = new SAXBuilder(false).build(method.getResponseBodyAsStream()).getRootElement(); Element channel = root.getChild("channel"); if (channel != null) { List<Element> children = channel.getChildren("item"); - LOG.info("JIRA: " + children.size() + " issues found"); + LOG.debug("Total issues in JIRA RSS feed: " + children.size()); return ContainerUtil.map(children, new Function<Element, Task>() { - public Task fun(Element o) { - return new JiraSoapTask(new JIRAIssueBean(myRepository.getUrl(), o, false), myRepository); + public Task fun(Element element) { + return new JiraSoapTask(element, myRepository); } }); } @@ -87,80 +83,11 @@ public class JiraSoapApi extends JiraRemoteApi { return ContainerUtil.emptyList(); } - private HttpClient login() throws Exception { - HttpClient client = myRepository.getHttpClient(); - client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY); - if (myJira4) { - PostMethod postMethod = getLoginMethodFor4x(); - client.executeMethod(postMethod); - if (checkLoginResult(postMethod)) { - return client; - } - } - // try 3.x protocol - axisLogin(); - return client; - } - - private void axisLogin() throws Exception { - - try { - JiraSoapService soapService = - new JiraSoapServiceServiceLocator().getJirasoapserviceV2(new URL(myRepository.getUrl() + "/rpc/soap/jirasoapservice-v2")); - if (myRepository.isUseProxy()) { - final List<KeyValue<String, String>> list = HttpConfigurable.getJvmPropertiesList(false, null); - if (!list.isEmpty()) { - for (KeyValue<String, String> value : list) { - AxisProperties.setProperty(value.getKey(), value.getValue()); - } - } - } - - soapService.login(myRepository.getUsername(), myRepository.getPassword()); - } - catch (RemoteException e) { - String message = e.toString(); - int i = message.indexOf(": "); - if (i > 0) { - message = message.substring(i + 2); - } - throw new Exception(message, e); - } - } - - private boolean checkLoginResult(PostMethod postMethod) throws IOException { - int statusCode = postMethod.getStatusCode(); - if (statusCode == HttpStatus.SC_NOT_FOUND) { - myJira4 = false; - return false; - } - if (statusCode != HttpStatus.SC_OK && statusCode != HttpStatus.SC_MOVED_TEMPORARILY) { - throw new IOException("Can't login: " + statusCode + " (" + HttpStatus.getStatusText(statusCode) + ")"); - } - if (statusCode == HttpStatus.SC_OK && new String(postMethod.getResponseBody(2000)).contains("\"loginSucceeded\":false")) { - throw new IOException(JiraRepository.LOGIN_FAILED_CHECK_YOUR_PERMISSIONS); - } - return true; - } - - private PostMethod getLoginMethodFor4x() { - String url = myRepository.getUrl() + "/rest/gadget/1.0/login"; - PostMethod postMethod = new PostMethod(url); - postMethod.addParameter("os_username", myRepository.getUsername()); - postMethod.addParameter("os_password", myRepository.getPassword()); - postMethod.addParameter("os_destination", "/success"); - return postMethod; - } - @Nullable @Override public Task findTask(String key) throws Exception { try { - StringBuilder url = new StringBuilder(myRepository.getUrl()); - url.append("/si/jira.issueviews:issue-xml/"); - url.append(key).append('/').append(key).append(".xml"); - - List<Task> tasks = processRSS(url.toString(), login()); + List<Task> tasks = processRSS(new GetMethod(myRepository.getUrl() + RSS_ISSUE_PATH + key + '/' + key + ".xml")); return tasks.isEmpty() ? null : tasks.get(0); } catch (Exception e) { @@ -177,11 +104,11 @@ public class JiraSoapApi extends JiraRemoteApi { @Override public void setTaskState(Task task, TaskState state) throws Exception { - throw new Exception("Task state cannot be updated in JIRA versions prior 4.2."); + throw new Exception(TaskBundle.message("jira.failure.no.state.update")); } @Override public void updateTimeSpend(LocalTask task, String timeSpent, String comment) throws Exception { - throw new Exception("Time spent cannot be updated in JIRA versions prior 4.2."); + throw new Exception(TaskBundle.message("jira.failure.no.time.spent")); } } diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/soap/JiraSoapTask.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/soap/JiraSoapTask.java index c4324953f0bf..9da515a31af3 100644 --- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/soap/JiraSoapTask.java +++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/soap/JiraSoapTask.java @@ -16,8 +16,7 @@ package com.intellij.tasks.jira.soap; -import com.atlassian.theplugin.jira.api.JIRAComment; -import com.atlassian.theplugin.jira.api.JIRAIssue; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.tasks.Comment; import com.intellij.tasks.TaskRepository; import com.intellij.tasks.TaskState; @@ -25,6 +24,7 @@ import com.intellij.tasks.TaskType; import com.intellij.tasks.jira.JiraTask; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; +import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -37,100 +37,133 @@ import java.util.Locale; /** * Slightly refactored original version of {@link JIRAIssue} adapter for SOAP version of JIRA API. * + * @author Mikhail Golubev * @author Dmitry Avdeev */ class JiraSoapTask extends JiraTask { - private final JIRAIssue myJiraIssue; + private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z", Locale.US); - public JiraSoapTask(@NotNull JIRAIssue jiraIssue, @NotNull TaskRepository repository) { + private final String myKey; + private final String mySummary; + private final String myDescription; + private final String myIconUrl; + private final Date myUpdated; + private final Date myCreated; + private final TaskState myState; + private final TaskType myType; + + private final List<Comment> myComments; + + public JiraSoapTask(@NotNull Element element, @NotNull TaskRepository repository) { super(repository); - myJiraIssue = jiraIssue; + myKey = element.getChildText("key"); + mySummary = element.getChildText("summary"); + myDescription = element.getChildText("description"); + + myIconUrl = getChildAttribute(element, "type", "iconUrl"); + + myType = getTypeByName(element.getChildText("type")); + + String statusIdText = getChildAttribute(element, "status", "id"); + myState = getStateById(StringUtil.isEmpty(statusIdText) ? 0 : Integer.parseInt(statusIdText)); + + myCreated = parseDate(element.getChildText("created")); + myUpdated = parseDate(element.getChildText("updated")); + + Element comments = element.getChild("comments"); + if (comments != null) { + myComments = ContainerUtil.map(comments.getChildren("comment"), new Function<Element, Comment>() { + @Override + public Comment fun(final Element element) { + return new Comment() { + @Override + public String getText() { + return element.getText(); + } + + @Nullable + @Override + public String getAuthor() { + return element.getAttributeValue("author"); + } + + @Nullable + @Override + public Date getDate() { + return parseDate(element.getAttributeValue("created")); + } + }; + } + }); + } else { + myComments = ContainerUtil.emptyList(); + } } @NotNull public String getId() { - return myJiraIssue.getKey(); + return myKey; } @NotNull public String getSummary() { - return myJiraIssue.getSummary(); + return mySummary; } public String getDescription() { - return myJiraIssue.getDescription(); + return myDescription; } @NotNull public Comment[] getComments() { - List<JIRAComment> jiraComments = myJiraIssue.getComments(); - if (jiraComments == null) return new Comment[0]; - return ContainerUtil.map2Array(jiraComments, Comment.class, new Function<JIRAComment, Comment>() { - public Comment fun(final JIRAComment comment) { - return new Comment() { - - public String getText() { - return comment.getBody(); - } - - public String getAuthor() { - return comment.getAuthorFullName(); - } - - public Date getDate() { - return comment.getCreationDate().getTime(); - } - - @Override - public String toString() { - return comment.getAuthorFullName(); - } - }; - } - }); + return myComments.toArray(new Comment[myComments.size()]); } @Nullable @Override protected String getIconUrl() { - return myJiraIssue.getTypeIconUrl(); + return myIconUrl; } @NotNull @Override public TaskType getType() { - return getTypeByName(myJiraIssue.getType()); + return myType; } @Override public TaskState getState() { - return getStateById((int)myJiraIssue.getStatusId()); + return myState; } @Nullable @Override public Date getUpdated() { - return getDate(myJiraIssue.getUpdated()); + return myUpdated; + } + + @Override + public Date getCreated() { + return myCreated; } @Nullable - private static Date getDate(String date) { + private static Date parseDate(@NotNull String date) { try { - return new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z", Locale.US).parse(date); + return DATE_FORMAT.parse(date); } catch (ParseException e) { return null; } } - @Override - public Date getCreated() { - return getDate(myJiraIssue.getCreated()); - } - - @Override - public String getIssueUrl() { - return myJiraIssue.getIssueUrl(); + @Nullable + private static String getChildAttribute(@NotNull Element parent, @NotNull String childName, @NotNull String attributeName) { + Element child = parent.getChild(childName); + if (child == null) { + return null; + } + return child.getAttributeValue(attributeName); } } diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/soap/JiraXmlRpcApi.txt b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/soap/JiraXmlRpcApi.txt new file mode 100644 index 000000000000..55e95da2f202 --- /dev/null +++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/soap/JiraXmlRpcApi.txt @@ -0,0 +1,179 @@ +package com.intellij.tasks.jira.soap; + +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.util.text.StringUtil; +import com.intellij.tasks.*; +import com.intellij.tasks.impl.TaskUtil; +import com.intellij.tasks.jira.JiraRemoteApi; +import com.intellij.tasks.jira.JiraRepository; +import com.intellij.util.Function; +import com.intellij.util.containers.ContainerUtil; +import icons.TasksIcons; +import org.apache.commons.httpclient.HttpClient; +import org.apache.xmlrpc.CommonsXmlRpcTransport; +import org.apache.xmlrpc.XmlRpcClient; +import org.apache.xmlrpc.XmlRpcException; +import org.apache.xmlrpc.XmlRpcRequest; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import javax.swing.*; +import java.net.URL; +import java.util.*; + + +/** + * Legacy XML-RPC connector restored due to IDEA-120595. + * + * @author Mikhail Golubev + */ +@SuppressWarnings("UseOfObsoleteCollectionType") +public class JiraXmlRpcApi extends JiraRemoteApi { + + private static final Logger LOG = Logger.getInstance(JiraXmlRpcApi.class); + private static final String XML_RPC_APT_PATH = "/rpc/xmlrpc"; + + + public JiraXmlRpcApi(@NotNull JiraRepository repository) { + super(repository); + } + + @SuppressWarnings("unchecked") + private <T> T execute(@NotNull String method, @NotNull Object... args) throws Exception { + URL url = new URL(myRepository.getUrl() + XML_RPC_APT_PATH); + XmlRpcClient client = new XmlRpcClient(url); + HttpClient httpClient = myRepository.getHttpClient(); + CommonsXmlRpcTransport transport = new CommonsXmlRpcTransport(url, httpClient); + //transport.setBasicAuthentication(myRepository.getUsername(), myRepository.getPassword()); + // empty token can be added to every method parameters, if basic authorization scheme is used to login + Vector<Object> parameters = new Vector<Object>(ContainerUtil.concat(false, Arrays.asList(args), "")); + XmlRpcRequest request = new XmlRpcRequest("jira1." + method, parameters); + try { + return (T)client.execute(request, transport); + } + // TODO error handling + catch (XmlRpcException e) { + LOG.error(e); + // extract server message + String message = e.getMessage(); + int index = message.lastIndexOf(':'); + if (index >= 0 && index < message.length() - 1) { + message = message.substring(index + 1); + } + throw new Exception(TaskBundle.message("failure.server.message", message), e); + } + } + + @NotNull + @Override + public List<Task> findTasks(String query, int max) throws Exception { + Vector<Object> raw = execute("getIssuesFromTextSearch", StringUtil.isEmpty(query) ? "i" : query); + List<Task> tasks = ContainerUtil.mapNotNull(raw, new Function<Object, Task>() { + @SuppressWarnings("unchecked") + @Override + public Task fun(Object task) { + return createIssue((Hashtable<String, Object>)task); + } + }); + return tasks.subList(0, Math.max(tasks.size(), max)); + } + + @Nullable + @Override + public Task findTask(String key) throws Exception { + return createIssue(this.<Hashtable<String, Object>>execute("getIssue", key)); + } + + @Nullable + private static Task createIssue(@Nullable final Hashtable<String, Object> map) { + if (map == null) { + return null; + } + // TODO filter by assignee? + return new Task() { + @NotNull + @Override + public String getId() { + return (String)map.get("key"); + } + + @NotNull + @Override + public String getSummary() { + return (String)map.get("summary"); + } + + @NotNull + @Override + public String getDescription() { + return (String)map.get("description"); + } + + @Nullable + @Override + public Date getCreated() { + return TaskUtil.parseDate((String)map.get("created")); + } + + @Nullable + @Override + public Date getUpdated() { + return TaskUtil.parseDate((String)map.get("updated")); + } + + @NotNull + @Override + public Comment[] getComments() { + // TODO + return new Comment[0]; + } + + @NotNull + @Override + public Icon getIcon() { + return TasksIcons.Jira; + } + + @NotNull + @Override + public TaskType getType() { + // TODO + return null; + } + + @Override + public boolean isClosed() { + // TODO + return false; + } + + @Override + public boolean isIssue() { + return true; + } + + @Nullable + @Override + public String getIssueUrl() { + // TODO + return null; + } + }; + } + + @NotNull + @Override + public final ApiType getType() { + return ApiType.XML_RPC; + } + + @Override + public void setTaskState(Task task, TaskState state) throws Exception { + throw new Exception(TaskBundle.message("jira.failure.no.state.update")); + } + + @Override + public void updateTimeSpend(LocalTask task, String timeSpent, String comment) throws Exception { + throw new Exception(TaskBundle.message("jira.failure.no.time.spent")); + } +} diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/TaskBundle.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/TaskBundle.java new file mode 100644 index 000000000000..385e0048fa8f --- /dev/null +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/TaskBundle.java @@ -0,0 +1,39 @@ +package com.intellij.tasks; + +import com.intellij.CommonBundle; +import com.intellij.reference.SoftReference; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.PropertyKey; + +import java.lang.ref.Reference; +import java.util.ResourceBundle; + +/** + * Contains common and repository specific messages for "Tasks and Contexts" subsystem. + * Initialization logic follows the same pattern as most of the other bundles in project. + * + * @author Mikhail Golubev + */ +public class TaskBundle { + + private static Reference<ResourceBundle> ourBundle; + @NonNls private static final String BUNDLE = "com.intellij.tasks.TaskBundle"; + + private TaskBundle() { + // empty + } + + public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, @NotNull Object... params) { + return CommonBundle.message(getBundle(), key, params); + } + + private static ResourceBundle getBundle() { + ResourceBundle bundle = SoftReference.dereference(ourBundle); + if (bundle == null) { + bundle = ResourceBundle.getBundle(BUNDLE); + ourBundle = new SoftReference<ResourceBundle>(bundle); + } + return bundle; + } +} diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/TaskBundle.properties b/plugins/tasks/tasks-core/src/com/intellij/tasks/TaskBundle.properties new file mode 100644 index 000000000000..66c38b3c02fb --- /dev/null +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/TaskBundle.properties @@ -0,0 +1,20 @@ +failure.login=Login failed. Check your credentials. +failure.permissions=Request failed. Check your permissions. +failure.server.message=Request failed. Reason: {0} +failure.http.error=Request failed with HTTP error: {0,number} {1}. + +## JIRA +jira.default.query=assignee = currentUser() and resolution = Unresolved order by updated + +# Missing features +jira.failure.no.REST=JIRA below 4.2.0 doesn't have REST API and is no longer supported. +# actually JQL support was first added to SOAP API for JIRA 4.0 +jira.failure.no.JQL=JQL search cannot be used in JIRA versions prior 4.2. +jira.failure.no.time.spent=Time spent cannot be updated in JIRA versions prior 4.2. +jira.failure.no.state.update=Task state cannot be updated in JIRA versions prior 5.0. + +jira.failure.captcha=Login failed. Enter captcha in web-interface. + +## YouTrack +youtrack.default.query=for: me sort by: updated #Unresolved + diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java index 909c0377e9da..317750ff9bab 100644 --- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java +++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java @@ -19,6 +19,7 @@ import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.intellij.tasks.Task; +import com.intellij.tasks.TaskBundle; import com.intellij.tasks.TaskManagerTestCase; import com.intellij.tasks.TaskState; import com.intellij.tasks.config.TaskSettings; @@ -67,7 +68,7 @@ public class JiraIntegrationTest extends TaskManagerTestCase { //noinspection ConstantConditions Exception exception = myRepository.createCancellableConnection().call(); assertNotNull(exception); - assertEquals(JiraRepository.LOGIN_FAILED_CHECK_YOUR_PERMISSIONS, exception.getMessage()); + assertEquals(TaskBundle.message("failure.login"), exception.getMessage()); } public void testVersionDiscovery() throws Exception { diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java index 6624ad9b5555..d252c93bcb34 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java @@ -15,6 +15,7 @@ import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.Task; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.util.Pair; import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowManager; @@ -23,6 +24,7 @@ import com.jediterm.terminal.TtyConnector; import com.jediterm.terminal.ui.TerminalSession; import com.jediterm.terminal.ui.TerminalWidget; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -65,7 +67,7 @@ public abstract class AbstractTerminalRunner<T extends Process> { private void doRun() { // Create Server process try { - final T process = createProcess(); + final T process = createProcess(null); UIUtil.invokeLaterIfNeeded(new Runnable() { @Override @@ -79,21 +81,21 @@ public abstract class AbstractTerminalRunner<T extends Process> { } } - protected abstract T createProcess() throws ExecutionException; + protected abstract T createProcess(@Nullable String directory) throws ExecutionException; protected abstract ProcessHandler createProcessHandler(T process); @NotNull public JBTabbedTerminalWidget createTerminalWidget(@NotNull Disposable parent) { final JBTerminalSystemSettingsProvider provider = new JBTerminalSystemSettingsProvider(); - JBTabbedTerminalWidget terminalWidget = new JBTabbedTerminalWidget(myProject, provider, new Predicate<TerminalWidget>() { + JBTabbedTerminalWidget terminalWidget = new JBTabbedTerminalWidget(myProject, provider, new Predicate<Pair<TerminalWidget, String>>() { @Override - public boolean apply(TerminalWidget widget) { - openSession(widget); + public boolean apply(Pair<TerminalWidget, String> widget) { + openSessionInDirectory(widget.getFirst(), widget.getSecond()); return true; } }, parent); - openSession(terminalWidget); + openSessionInDirectory(terminalWidget, null); return terminalWidget; } @@ -102,12 +104,10 @@ public abstract class AbstractTerminalRunner<T extends Process> { final DefaultActionGroup toolbarActions = new DefaultActionGroup(); final ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, toolbarActions, false); - final JPanel panel = new JPanel(new BorderLayout()); panel.add(actionToolbar.getComponent(), BorderLayout.WEST); - actionToolbar.setTargetComponent(panel); @@ -121,15 +121,15 @@ public abstract class AbstractTerminalRunner<T extends Process> { toolbarActions.add(createCloseAction(defaultExecutor, contentDescriptor)); final JBTerminalSystemSettingsProvider provider = new JBTerminalSystemSettingsProvider(); - TerminalWidget widget = new JBTabbedTerminalWidget(myProject, provider, new Predicate<TerminalWidget>() { + TerminalWidget widget = new JBTabbedTerminalWidget(myProject, provider, new Predicate<Pair<TerminalWidget, String>>() { @Override - public boolean apply(TerminalWidget widget) { - openSession(widget); + public boolean apply(Pair<TerminalWidget, String> widget) { + openSessionInDirectory(widget.getFirst(), widget.getSecond()); return true; } }, contentDescriptor); - openSession(widget, createTtyConnector(process)); + createAndStartSession(widget, createTtyConnector(process)); panel.add(widget.getComponent(), BorderLayout.CENTER); @@ -138,7 +138,11 @@ public abstract class AbstractTerminalRunner<T extends Process> { processHandler.startNotify(); } - public static void openSession(@NotNull TerminalWidget terminal, @NotNull TtyConnector ttyConnector) { + public void openSession(@NotNull TerminalWidget terminal) { + openSessionInDirectory(terminal, null); + } + + public static void createAndStartSession(@NotNull TerminalWidget terminal, @NotNull TtyConnector ttyConnector) { TerminalSession session = terminal.createTerminalSession(ttyConnector); session.start(); } @@ -156,7 +160,7 @@ public abstract class AbstractTerminalRunner<T extends Process> { // Show in run toolwindow ExecutionManager.getInstance(myProject).getContentManager().showRunContent(defaultExecutor, myDescriptor); -// Request focus + // Request focus final ToolWindow window = ToolWindowManager.getInstance(myProject).getToolWindow(defaultExecutor.getId()); window.activate(new Runnable() { public void run() { @@ -170,12 +174,12 @@ public abstract class AbstractTerminalRunner<T extends Process> { return myProject; } - public void openSession(@NotNull TerminalWidget terminalWidget) { + public void openSessionInDirectory(@NotNull TerminalWidget terminalWidget, @Nullable String directory) { // Create Server process try { - final T process = createProcess(); + final T process = createProcess(directory); - openSession(terminalWidget, createTtyConnector(process)); + createAndStartSession(terminalWidget, createTtyConnector(process)); } catch (Exception e) { LOG.error("Can't open terminal session:" + e.getMessage(), e); diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTabbedTerminalWidget.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTabbedTerminalWidget.java index f714c38bc3da..9b595a9209b5 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTabbedTerminalWidget.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTabbedTerminalWidget.java @@ -1,6 +1,10 @@ package org.jetbrains.plugins.terminal; import com.google.common.base.Predicate; +import com.intellij.ide.dnd.DnDDropHandler; +import com.intellij.ide.dnd.DnDEvent; +import com.intellij.ide.dnd.DnDSupport; +import com.intellij.ide.dnd.TransferableWrapper; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnAction; @@ -11,7 +15,11 @@ import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.Pair; import com.intellij.openapi.wm.IdeFocusManager; +import com.intellij.psi.PsiDirectory; +import com.intellij.psi.PsiFile; +import com.intellij.psi.PsiFileSystemItem; import com.intellij.ui.SimpleColoredComponent; import com.intellij.ui.components.JBTextField; import com.intellij.ui.docking.DockManager; @@ -36,7 +44,7 @@ import java.util.concurrent.CopyOnWriteArraySet; /** * @author traff */ -public class JBTabbedTerminalWidget extends TabbedTerminalWidget implements Disposable{ +public class JBTabbedTerminalWidget extends TabbedTerminalWidget implements Disposable { private Project myProject; private final JBTerminalSystemSettingsProvider mySettingsProvider; @@ -44,8 +52,13 @@ public class JBTabbedTerminalWidget extends TabbedTerminalWidget implements Disp public JBTabbedTerminalWidget(@NotNull Project project, @NotNull JBTerminalSystemSettingsProvider settingsProvider, - @NotNull Predicate<TerminalWidget> createNewSessionAction, @NotNull Disposable parent) { - super(settingsProvider, createNewSessionAction); + final @NotNull Predicate<Pair<TerminalWidget, String>> createNewSessionAction, @NotNull Disposable parent) { + super(settingsProvider, new Predicate<TerminalWidget>() { + @Override + public boolean apply(TerminalWidget input) { + return createNewSessionAction.apply(Pair.<TerminalWidget, String>create(input, null)); + } + }); myProject = project; mySettingsProvider = settingsProvider; @@ -55,6 +68,26 @@ public class JBTabbedTerminalWidget extends TabbedTerminalWidget implements Disp Disposer.register(parent, this); Disposer.register(this, settingsProvider); + + DnDSupport.createBuilder(this).setDropHandler(new DnDDropHandler() { + @Override + public void drop(DnDEvent event) { + if (event.getAttachedObject() instanceof TransferableWrapper) { + TransferableWrapper ao = (TransferableWrapper)event.getAttachedObject(); + if (ao != null && + ao.getPsiElements() != null && + ao.getPsiElements().length == 1 && + ao.getPsiElements()[0] instanceof PsiFileSystemItem) { + PsiFileSystemItem element = (PsiFileSystemItem)ao.getPsiElements()[0]; + PsiDirectory dir = element instanceof PsiFile ? ((PsiFile)element).getContainingDirectory() : (PsiDirectory)element; + + createNewSessionAction.apply(Pair.<TerminalWidget, String>create(JBTabbedTerminalWidget.this, dir.getVirtualFile().getPath())); + } + } + } + } + + ).install(); } public static void convertActions(@NotNull JComponent component, @@ -220,7 +253,7 @@ public class JBTabbedTerminalWidget extends TabbedTerminalWidget implements Disp } private class TerminalTabLabel extends TabLabel { - public TerminalTabLabel(final JBTabsImpl tabs, TabInfo info) { + public TerminalTabLabel(final JBTabsImpl tabs, final TabInfo info) { super(tabs, info); setOpaque(false); @@ -244,20 +277,32 @@ public class JBTabbedTerminalWidget extends TabbedTerminalWidget implements Disp handleMouse(event); } - private void handleMouse(MouseEvent event) { - if (event.isPopupTrigger()) { + private void handleMouse(MouseEvent e) { + if (e.isPopupTrigger()) { JPopupMenu menu = createPopup(); - menu.show(event.getComponent(), event.getX(), event.getY()); + menu.show(e.getComponent(), e.getX(), e.getY()); } - else { + else if (e.getButton() != MouseEvent.BUTTON2) { myTabs.select(getInfo(), true); - if (event.getClickCount() == 2 && !event.isConsumed()) { - event.consume(); + if (e.getClickCount() == 2 && !e.isConsumed()) { + e.consume(); renameTab(); } } } + + @Override + public void mouseClicked(MouseEvent e) { + if (e.getButton() == MouseEvent.BUTTON2) { + if (myTabs.getSelectedInfo() == info) { + closeCurrentSession(); + } + else { + myTabs.select(info, true); + } + } + } }); } @@ -354,14 +399,14 @@ public class JBTabbedTerminalWidget extends TabbedTerminalWidget implements Disp @Override public void dragOutFinished(MouseEvent event, TabInfo source) { myFile.putUserData(FileEditorManagerImpl.CLOSING_TO_REOPEN, Boolean.TRUE); - - + + myTabs.removeTab(source); - + mySession.process(event); myFile.putUserData(FileEditorManagerImpl.CLOSING_TO_REOPEN, null); - + myFile = null; mySession = null; diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java index e9de7fb33f68..87b4c34bdc3b 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java @@ -20,7 +20,9 @@ package org.jetbrains.plugins.terminal; import com.google.common.base.Predicate; +import com.google.common.collect.Lists; import com.intellij.ide.GeneralSettings; +import com.intellij.ide.IdeEventQueue; import com.intellij.ide.ui.UISettings; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; @@ -41,7 +43,9 @@ import com.jediterm.terminal.ui.TerminalPanel; import org.intellij.lang.annotations.JdkConstants; import org.jetbrains.annotations.NotNull; +import javax.swing.*; import java.awt.*; +import java.awt.List; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.StringSelection; import java.awt.datatransfer.UnsupportedFlavorException; @@ -51,10 +55,16 @@ import java.awt.event.KeyEvent; import java.awt.image.BufferedImage; import java.awt.image.ImageObserver; import java.io.IOException; +import java.util.*; + +public class JBTerminalPanel extends TerminalPanel implements FocusListener, TerminalSettingsListener, Disposable, + IdeEventQueue.EventDispatcher { + private static final String[] ACTIONS_TO_SKIP = new String[]{"ActivateTerminalToolWindow", "ShowSettings"}; -public class JBTerminalPanel extends TerminalPanel implements FocusListener, TerminalSettingsListener, Disposable { private final JBTerminalSystemSettingsProvider mySettingsProvider; + private java.util.List<AnAction> myActionsToSkip; + public JBTerminalPanel(@NotNull JBTerminalSystemSettingsProvider settingsProvider, @NotNull BackBuffer backBuffer, @NotNull StyleState styleState) { @@ -70,48 +80,43 @@ public class JBTerminalPanel extends TerminalPanel implements FocusListener, Ter } }); - registerKeymapActions(this); - addFocusListener(this); mySettingsProvider.addListener(this); } - private static void registerKeymapActions(final TerminalPanel terminalPanel) { - Keymap keymap = KeymapManager.getInstance().getActiveKeymap(); - String[] actionIds = keymap.getActionIds(); + @Override + public boolean dispatch(AWTEvent e) { + if (e instanceof KeyEvent && !skipKeyEvent((KeyEvent)e)) { + dispatchEvent(e); + return true; + } + return false; + } + + private boolean skipKeyEvent(KeyEvent e) { + if (myActionsToSkip == null) { + return false; + } + int kc = e.getKeyCode(); + return kc == KeyEvent.VK_ESCAPE || skipAction(e); + } - ActionManager actionManager = ActionManager.getInstance(); - for (String actionId : actionIds) { - final AnAction action = actionManager.getAction(actionId); - if (action != null) { - AnAction a = new DumbAwareAction() { - @Override - public void actionPerformed(AnActionEvent e) { - if (e.getInputEvent() instanceof KeyEvent) { - AnActionEvent event = new AnActionEvent(e.getInputEvent(), e.getDataContext(), e.getPlace(), new Presentation(), e.getActionManager(), e.getModifiers()); - action.update(event); - if (event.getPresentation().isEnabled()) { - action.actionPerformed(event); - } - else { - terminalPanel.handleKeyEvent((KeyEvent)event.getInputEvent()); - } - - event.getInputEvent().consume(); - } - } - }; + private boolean skipAction(KeyEvent e) { + if (myActionsToSkip != null) { + final KeyboardShortcut eventShortcut = new KeyboardShortcut(KeyStroke.getKeyStrokeForEvent(e), null); + for (AnAction action : myActionsToSkip) { for (Shortcut sc : action.getShortcutSet().getShortcuts()) { - if (sc.isKeyboard() && sc instanceof KeyboardShortcut) { - KeyboardShortcut ksc = (KeyboardShortcut)sc; - a.registerCustomShortcutSet(ksc.getFirstKeyStroke().getKeyCode(), ksc.getFirstKeyStroke().getModifiers(), terminalPanel); + if (sc.isKeyboard() && sc.startsWith(eventShortcut)) { + return true; } } } } + return false; } + @Override protected void setupAntialiasing(Graphics graphics) { UIUtil.setupComposite((Graphics2D)graphics); @@ -181,13 +186,39 @@ public class JBTerminalPanel extends TerminalPanel implements FocusListener, Ter @Override public void focusGained(FocusEvent event) { + installKeyDispatcher(); + if (GeneralSettings.getInstance().isSaveOnFrameDeactivation()) { FileDocumentManager.getInstance().saveAllDocuments(); } } + private void installKeyDispatcher() { + if (TerminalOptionsProvider.getInstance().overrideIdeShortcuts()) { + myActionsToSkip = setupActionsToSkip(); + IdeEventQueue.getInstance().addDispatcher(this, this); + } + else { + myActionsToSkip = null; + } + } + + private static java.util.List<AnAction> setupActionsToSkip() { + java.util.List<AnAction> res = Lists.newArrayList(); + ActionManager actionManager = ActionManager.getInstance(); + for (String actionId : ACTIONS_TO_SKIP) { + res.add(actionManager.getAction(actionId)); + } + return res; + } + @Override public void focusLost(FocusEvent event) { + if (myActionsToSkip != null) { + myActionsToSkip = null; + IdeEventQueue.getInstance().removeDispatcher(this); + } + JBTerminalStarter.refreshAfterExecution(); } diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java index 3d0ec61e5c0a..caaa54166e7d 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java @@ -1,6 +1,7 @@ package org.jetbrains.plugins.terminal; import com.intellij.execution.TaskExecutor; +import com.intellij.execution.configurations.EncodingEnvironmentUtil; import com.intellij.execution.process.*; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; @@ -8,7 +9,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.util.SystemInfo; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.Consumer; import com.intellij.util.containers.HashMap; @@ -64,11 +64,12 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess } @Override - protected PtyProcess createProcess() throws ExecutionException { + protected PtyProcess createProcess(@Nullable String directory) throws ExecutionException { Map<String, String> envs = new HashMap<String, String>(System.getenv()); - envs.put("TERM", "xterm"); + envs.put("TERM", "xterm-256color"); + EncodingEnvironmentUtil.fixDefaultEncodingIfMac(envs, getProject()); try { - return PtyProcess.exec(getCommand(), envs, currentProjectFolder()); + return PtyProcess.exec(getCommand(), envs, directory != null ? directory : currentProjectFolder()); } catch (IOException e) { throw new ExecutionException(e); diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsProvider.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsProvider.java index 840bf05e3d63..8bf9850c4cf6 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsProvider.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsProvider.java @@ -54,6 +54,7 @@ public class TerminalOptionsProvider implements PersistentStateComponent<Termina myState.myTabName = state.myTabName; myState.myCopyOnSelection = state.myCopyOnSelection; myState.myPasteOnMiddleMouseButton = state.myPasteOnMiddleMouseButton; + myState.myOverrideIdeShortcuts = state.myOverrideIdeShortcuts; } public boolean closeSessionOnLogout() { @@ -72,6 +73,14 @@ public class TerminalOptionsProvider implements PersistentStateComponent<Termina return myState.myTabName; } + public boolean overrideIdeShortcuts() { + return myState.myOverrideIdeShortcuts; + } + + public void setOverrideIdeShortcuts(boolean overrideIdeShortcuts) { + myState.myOverrideIdeShortcuts = overrideIdeShortcuts; + } + public static class State { public String myShellPath = getDefaultShellPath(); public String myTabName = "Local"; @@ -80,6 +89,7 @@ public class TerminalOptionsProvider implements PersistentStateComponent<Termina public boolean mySoundBell = true; public boolean myCopyOnSelection = true; public boolean myPasteOnMiddleMouseButton = true; + public boolean myOverrideIdeShortcuts = true; } public String getShellPath() { diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.form b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.form index c4dd803dced3..f7a6ca92b311 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.form +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.form @@ -8,7 +8,7 @@ <properties/> <border type="none"/> <children> - <grid id="8f9b9" layout-manager="GridLayoutManager" row-count="6" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> + <grid id="8f9b9" layout-manager="GridLayoutManager" row-count="7" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <margin top="0" left="0" bottom="0" right="0"/> <constraints> <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> @@ -63,7 +63,7 @@ </grid> <vspacer id="d777c"> <constraints> - <grid row="5" column="0" row-span="1" col-span="3" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/> + <grid row="6" column="0" row-span="1" col-span="3" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/> </constraints> </vspacer> <grid id="caa1d" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> @@ -181,6 +181,29 @@ </hspacer> </children> </grid> + <grid id="74977" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> + <margin top="0" left="0" bottom="0" right="0"/> + <constraints> + <grid row="5" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> + </constraints> + <properties/> + <border type="none"/> + <children> + <component id="226ed" class="com.intellij.ui.components.JBCheckBox" binding="myOverrideIdeShortcuts"> + <constraints> + <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/> + </constraints> + <properties> + <text value="Override IDE shortcuts"/> + </properties> + </component> + <hspacer id="e2d4a"> + <constraints> + <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/> + </constraints> + </hspacer> + </children> + </grid> </children> </grid> </children> diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.java index ff0a771a1d60..a1f20779f979 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.java @@ -36,6 +36,7 @@ public class TerminalSettingsPanel { private JTextField myTabNameTextField; private JBCheckBox myPasteOnMiddleButtonCheckBox; private JBCheckBox myCopyOnSelectionCheckBox; + private JBCheckBox myOverrideIdeShortcuts; private TerminalOptionsProvider myOptionsProvider; public JComponent createPanel(@NotNull TerminalOptionsProvider provider) { @@ -63,6 +64,7 @@ public class TerminalSettingsPanel { || (mySoundBellCheckBox.isSelected() != myOptionsProvider.audibleBell()) || (myCopyOnSelectionCheckBox.isSelected() != myOptionsProvider.copyOnSelection()) || (myPasteOnMiddleButtonCheckBox.isSelected() != myOptionsProvider.pasteOnMiddleMouseButton()) + || (myOverrideIdeShortcuts.isSelected() != myOptionsProvider.overrideIdeShortcuts()) ; } @@ -74,6 +76,7 @@ public class TerminalSettingsPanel { myOptionsProvider.setSoundBell(mySoundBellCheckBox.isSelected()); myOptionsProvider.setCopyOnSelection(myCopyOnSelectionCheckBox.isSelected()); myOptionsProvider.setPasteOnMiddleMouseButton(myPasteOnMiddleButtonCheckBox.isSelected()); + myOptionsProvider.setOverrideIdeShortcuts(myOverrideIdeShortcuts.isSelected()); } public void reset() { @@ -84,5 +87,6 @@ public class TerminalSettingsPanel { mySoundBellCheckBox.setSelected(myOptionsProvider.audibleBell()); myCopyOnSelectionCheckBox.setSelected(myOptionsProvider.copyOnSelection()); myPasteOnMiddleButtonCheckBox.setSelected(myOptionsProvider.pasteOnMiddleMouseButton()); + myOverrideIdeShortcuts.setSelected(myOptionsProvider.overrideIdeShortcuts()); } } |
