diff options
Diffstat (limited to 'plugins')
86 files changed, 238 insertions, 272 deletions
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsConfigObject.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsConfigObject.java index 947d424b4f3..6a3b2f8d8dc 100644 --- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsConfigObject.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsConfigObject.java @@ -10,7 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.ats.api; +/** + * @author Donald G. Dunne + */ public interface IAtsConfigObject extends IAtsObject { - - String toStringWithId(); + // do nothing } diff --git a/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java b/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java index 8db00622f91..a1554e8b436 100644 --- a/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java +++ b/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java @@ -278,7 +278,7 @@ public class MockAtsWebSearchPresenter<T extends AtsSearchHeaderComponent, K ext } } - public static AtsSearchPresenter getInstance() { + public static AtsSearchPresenter<?, ?> getInstance() { return atsBackend; } diff --git a/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/LoadingCacheTest.java b/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/LoadingCacheTest.java index b9cfafe8bab..d656bc44b26 100644 --- a/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/LoadingCacheTest.java +++ b/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/LoadingCacheTest.java @@ -10,21 +10,19 @@ *******************************************************************************/ package org.eclipse.osee.cache.admin.internal; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; - import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.Callable; - import org.eclipse.osee.cache.admin.Cache; import org.eclipse.osee.cache.admin.CacheConfiguration; import org.eclipse.osee.cache.admin.CacheDataLoader; @@ -39,7 +37,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; - import com.google.common.collect.Iterables; /** diff --git a/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/NoneLoadingCacheTest.java b/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/NoneLoadingCacheTest.java index 66c51ed5b04..e3250a97bec 100644 --- a/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/NoneLoadingCacheTest.java +++ b/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/NoneLoadingCacheTest.java @@ -10,24 +10,21 @@ *******************************************************************************/ package org.eclipse.osee.cache.admin.internal; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; - import java.util.Arrays; import java.util.concurrent.Callable; - import org.eclipse.osee.cache.admin.Cache; import org.eclipse.osee.cache.admin.CacheConfiguration; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.MockitoAnnotations; - import com.google.common.collect.Iterables; /** diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/FixAttributeOperationTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/FixAttributeOperationTest.java index d9d30427acd..96df447014b 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/FixAttributeOperationTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/FixAttributeOperationTest.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.client.integration.tests.integration.define; -import static junit.framework.Assert.assertEquals; import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_1; import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.eq; diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactCacheQueryTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactCacheQueryTest.java index 3db20a5a585..d5e2c2d1807 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactCacheQueryTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactCacheQueryTest.java @@ -158,7 +158,7 @@ public class ArtifactCacheQueryTest { assertNotNull(artifactWithDoubleBbb); // should be two static id attributes - int count = artifactWithDoubleBbb.getAttributes(CoreAttributeTypes.StaticId).size(); + int count = artifactWithDoubleBbb.getAttributeCount(CoreAttributeTypes.StaticId); assertTrue("Expected 2 attributes; Returned " + count, count == 2); count = artifactWithDoubleBbb.getAttributeCount(CoreAttributeTypes.StaticId); diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactQueryTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactQueryTest.java index 56b66e9f9d3..2dedd2f61f9 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactQueryTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactQueryTest.java @@ -142,17 +142,15 @@ public class ArtifactQueryTest { criteria.add(new AttributeCriteria(CoreAttributeTypes.FavoriteBranch, "Common")); // test against a couple of attributes types that are not taggable; expect exception try { - List<Artifact> artifacts = - ArtifactQuery.getArtifactListFromCriteria(BranchManager.getCommonBranch(), 1000, criteria); + ArtifactQuery.getArtifactListFromCriteria(BranchManager.getCommonBranch(), 1000, criteria); Assert.fail("Should have thrown an exception as the attribute type are not taggable"); } catch (OseeCoreException e) { Assert.assertTrue(e.getMessage(), Boolean.TRUE); } try { - List<Artifact> artifacts = - ArtifactQuery.getArtifactListFromTypeAndAttribute(CoreArtifactTypes.User, CoreAttributeTypes.Active, - "true", BranchManager.getCommonBranch()); + ArtifactQuery.getArtifactListFromTypeAndAttribute(CoreArtifactTypes.User, CoreAttributeTypes.Active, "true", + BranchManager.getCommonBranch()); Assert.fail("Should have thrown an exception as the attribute type are not taggable"); } catch (OseeCoreException e) { Assert.assertTrue(e.getMessage(), Boolean.TRUE); @@ -161,17 +159,15 @@ public class ArtifactQueryTest { criteria.clear(); criteria.add(new AttributeCriteria(CoreAttributeTypes.Email, "john.doe@somewhere.com")); try { - List<Artifact> artifacts = - ArtifactQuery.getArtifactListFromCriteria(BranchManager.getCommonBranch(), 1000, criteria); + ArtifactQuery.getArtifactListFromCriteria(BranchManager.getCommonBranch(), 1000, criteria); Assert.assertTrue("This attribute type is taggable", Boolean.TRUE); } catch (OseeCoreException e) { Assert.fail(e.getMessage()); } try { - List<Artifact> artifacts = - ArtifactQuery.getArtifactListFromTypeAndAttribute(CoreArtifactTypes.User, CoreAttributeTypes.Notes, - "My Notes", BranchManager.getCommonBranch()); + ArtifactQuery.getArtifactListFromTypeAndAttribute(CoreArtifactTypes.User, CoreAttributeTypes.Notes, + "My Notes", BranchManager.getCommonBranch()); Assert.assertTrue("This attribute type is taggable", Boolean.TRUE); } catch (OseeCoreException e) { Assert.fail(e.getMessage()); @@ -269,4 +265,4 @@ public class ArtifactQueryTest { return "Wiki From Wikipedia, the free encyclopedia Jump to: navigation, search This article is about the type of website. For other uses, see Wiki (disambiguation). Not to be confused with Wikipedia. Edit summary redirects here. For edit summaries as used in Wikipedia, see Help:Edit summary. WikiNode redirects here. For the WikiNode of Wikipedia, see Wikipedia:WikiNode. Page semi-protected Ward Cunningham, inventor of the wiki A wiki (Listeni/'w?ki?/ WIK-ee) is a website which allows its users to add, modify, or delete its content via a web browser usually using a simplified markup language or a rich-text editor.[1][2][3] Wikis are powered by wiki software. Most are created collaboratively. Wikis serve many different purposes, such as knowledge management and notetaking. Wikis can be community websites and intranets, for example. Some permit control over different functions (levels of access). For example, editing rights may permit changing, adding or removing material. Others may permit access without enforcing access control. Other rules may also be imposed for organizing content. Ward Cunningham, the developer of the first wiki software, WikiWikiWeb, originally described it as the simplest online database that could possibly work.[4] Wiki (pronounced ['witi] or ['viti]) is a Hawaiian word meaning fast or quick.[5] Contents 1 Characteristics 1.1 Editing wiki pages 1.2 Navigation 1.3 Linking and creating pages 1.4 Searching 2 History 3 Implementations 4 Trust and security 4.1 Controlling changes 4.2 Trustworthiness 4.3 Security 4.3.1 Potential malware vector 5 Communities 5.1 Growth factors 6 Conferences 7 Rules 8 Legal environment 9 See also 10 References 11 Further reading 12 External links Characteristics Ward Cunningham and co-author Bo Leuf, in their book The Wiki Way: Quick Collaboration on the Web, described the essence of the Wiki concept as follows: A wiki invites all users to edit any page or to create new pages within the wiki Web site, using only a plain-vanilla Web browser without any extra add-ons. Wiki promotes meaningful topic associations between different pages by making page link creation almost intuitively easy and showing whether an intended target page exists or not. A wiki is not a carefully crafted site for casual visitors. Instead, it seeks to involve the visitor in an ongoing process of creation and collaboration that constantly changes the Web site landscape. A wiki enables communities to write documents collaboratively, using a simple markup language and a web browser. A single page in a wiki website is referred to as a wiki page, while the entire collection of pages, which are usually well interconnected by hyperlinks, is the wiki. A wiki is essentially a database for creating, browsing, and searching through information. A wiki allows for non-linear, evolving, complex and networked text, argument and interaction.[6] A defining characteristic of wiki technology is the ease with which pages can be created and updated. Generally, there is no review before modifications are accepted. Many wikis are open to alteration by the general public without requiring them to register user accounts. Many edits can be made in real-time and appear almost instantly online. This can facilitate abuse of the system. Private wiki servers require user authentication to edit pages, and sometimes even to read them. Maged N. Kamel Boulos, Cito Maramba and Steve Wheeler write that it is the openness of wikis that gives rise to the concept of 'Darwikinism', which is a concept that describes the 'socially Darwinian process' that wiki pages are subject to. Basically, because of the openness of wikis and the rapidity with which wiki pages can be edited, the pages undergo a natural selection process like that which nature subjects to living organisms. 'Unfit' sentences and sections are ruthlessly culled, edited and replaced if they are not considered 'fit', which hopefully results in the evolution of a higher quality and more relevant page. Whilst such openness may invite 'vandalism' and the posting of untrue information, this same openness also makes it possible to rapidly correct or restore a 'quality' wiki page.[7] Editing wiki pages There are many different ways in which wikis have users edit the content. Ordinarily, the structure and formatting of wiki pages are specified with a simplified markup language, sometimes known as wikitext (for example, starting a line of text with an asterisk often sets up a bulleted list). The style and syntax of wikitexts can vary greatly among wiki implementations, some of which also allow HTML tags. Designers of wikis often take this approach because HTML, with its many cryptic tags, is not very legible, making it hard to edit. Wikis therefore favour plain-text editing, with fewer and simpler conventions than HTML, for indicating style and structure. Although limiting access to HTML and Cascading Style Sheets (CSS) of wikis limits user ability to alter the structure and formatting of wiki content, there are some benefits. Limited access to CSS promotes consistency in the look and feel, and having JavaScript disabled prevents a user from implementing code that may limit access for other users. MediaWiki syntax Equivalent HTML Rendered output Take some more [[tea]], the March Hare said to Alice, very earnestly. I've had '''nothing''' yet, Alice replied in an offended tone, so I can't take more. You mean you can't take ''less''? said the Hatter. It's very easy to take ''more'' than nothing. <p>Take some more <a href=/wiki/Tea title=Tea>tea</a>, the March Hare said to Alice, very earnestly.</p> <p>I've had <b>nothing</b> yet, Alice replied in an offended tone, so I can't take more.</p> <p>You mean you can't take <i>less</i>? said the Hatter. It's very easy to take <i>more</i> than nothing.</p> Take some more tea, the March Hare said to Alice, very earnestly. I've had nothing yet, Alice replied in an offended tone, so I can't take more. You mean you can't take less? said the Hatter. It's very easy to take more than nothing. Increasingly, wikis are making WYSIWYG editing available to users, usually by means of JavaScript or an ActiveX control that translates graphically entered formatting instructions into the corresponding HTML tags or wikitext. In those implementations, the markup of a newly edited, marked-up version of the page is generated and submitted to the server transparently, shielding the user from this technical detail. However, WYSIWYG controls do not always provide all of the features available in wikitext, and some users prefer not to use a WYSIWYG editor. Hence, many of these sites offer some means to edit the wikitext directly. Most wikis keep a record of changes made to wiki pages; often, every version of the page is stored. This means that authors can revert to an older version of the page, should it be necessary because a mistake has been made or the page has been vandalized. Many implementations, like MediaWiki, allow users to supply an edit summary when they edit a page; this is a short piece of text summarising the changes. It is not inserted into the article, but is stored along with that revision of the page, allowing users to explain what has been done and why; this is similar to a log message when making changes to a revision-control system. Navigation Within the text of most pages there are usually a large number of hypertext links to other pages. This form of non-linear navigation is more native to wiki than structured/formalized navigation schemes. That said, users can also create any number of index or table-of-contents pages, with hierarchical categorization or whatever form of organization they like. These may be challenging to maintain by hand, as multiple authors create and delete pages in an ad hoc manner. Wikis generally provide one or more ways to categorize or tag pages to support the maintenance of such index pages. Most wikis have a backlink feature, which displays all pages that link to a given page. It is typical in a wiki to create links to pages that do not yet exist, as a way to invite others to share what they know about a subject new to the wiki. Linking and creating pages Links are created using a specific syntax, the so-called link pattern (also see CURIE). Originally, most wikis used CamelCase to name pages and create links. These are produced by capitalizing words in a phrase and removing the spaces between them (the word CamelCase is itself an example). While CamelCase makes linking very easy, it also leads to links which are written in a form that deviates from the standard spelling. To link to a page with a single-word title, one must abnormally capitalize one of the letters in the word (e.g. WiKi instead of Wiki). CamelCase-based wikis are instantly recognizable because they have many links with names such as TableOfContents and BeginnerQuestions. It is possible for a wiki to render the visible anchor for such links pretty by reinserting spaces, and possibly also reverting to lower case. However, this reprocessing of the link to improve the readability of the anchor is limited by the loss of capitalization information caused by CamelCase reversal. For example, RichardWagner should be rendered as Richard Wagner, whereas PopularMusic should be rendered as popular music. There is no easy way to determine which capital letters should remain capitalized. As a result, many wikis now have free linking using brackets, and some disable CamelCase by default. Searching Most wikis offer at least a title search, and sometimes a full-text search. The scalability of the search depends on whether the wiki engine uses a database. Some wikis, such as PmWiki, use flat files.[8] MediaWiki's first versions used flat files, but it was rewritten by Lee Daniel Crocker in the early 2000s to be a database application. Indexed database access is necessary for high speed searches on large wikis. Alternatively, external search engines such as Google Search can sometimes be used on wikis with limited searching functions in order to obtain more precise results. However, a search engine's indexes can be very out of date (days, weeks or months) for many websites. History Main article: History of wikis Wiki Wiki Shuttle at Honolulu International Airport WikiWikiWeb was the first wiki.[9] Ward Cunningham started developing WikiWikiWeb in Portland, Oregon, in 1994, and installed it on the Internet domain c2.com on March 25, 1995. It was named by Cunningham, who remembered a Honolulu International Airport counter employee telling him to take the Wiki Wiki Shuttle bus that runs between the airport's terminals. According to Cunningham, I chose wiki-wiki as an alliterative substitute for 'quick' and thereby avoided naming this stuff quick-web.[10][11] Cunningham was in part inspired by Apple's HyperCard. Apple had designed a system allowing users to create virtual card stacks supporting links among the various cards. Cunningham developed Vannevar Bush's ideas by allowing users to comment on and change one another's text.[2][12] In the early 2000s, wikis were increasingly adopted in enterprise as collaborative software. Common uses included project communication, intranets, and documentation, initially for technical users. Today some companies use wikis as their only collaborative software and as a replacement for static intranets, and some schools and universities use wikis to enhance group learning. There may be greater use of wikis behind firewalls than on the public Internet. On March 15, 2007, wiki entered the online Oxford English Dictionary.[13] Implementations Wiki software is a type of collaborative software that runs a wiki system, allowing web pages to be created and edited using a common web browser. It is usually implemented as an application server[citation needed] that runs on one or more web servers. The content is stored in a file system, and changes to the content are stored in a relational database management system. A commonly implemented software package is MediaWiki, which runs this encyclopedia. See the List of wiki software for further information. Alternatively, personal wikis run as a standalone application on a single computer. WikidPad is an example. Or even single local HTML file with JavaScript inside like TiddlyWiki. Wikis can also be created on a wiki farm, where the server side software is implemented by the wiki farm owner. PBwiki, Socialtext, Wetpaint, and Wikia are popular examples of such services. Some wiki farms can also make private, password-protected wikis. Note that free wiki farms generally contain advertising on every page. For"; } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactTest.java index a35e486f2da..e1c19635725 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactTest.java @@ -12,8 +12,8 @@ package org.eclipse.osee.client.integration.tests.integration.skynet.core; import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO; -import org.eclipse.osee.client.demo.DemoTypes; import org.eclipse.osee.client.demo.DemoBranches; +import org.eclipse.osee.client.demo.DemoTypes; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -47,8 +47,7 @@ public final class ArtifactTest { @Before public void setUp() throws Exception { - artifactWithSpecialAttr = - ArtifactTypeManager.addArtifact(DemoTypes.DemoTestRequirement, DemoBranches.SAW_Bld_1); + artifactWithSpecialAttr = ArtifactTypeManager.addArtifact(DemoTypes.DemoTestRequirement, DemoBranches.SAW_Bld_1); } @After @@ -69,7 +68,7 @@ public final class ArtifactTest { Artifact copiedArtifact = artifactWithSpecialAttr.duplicate(DemoBranches.SAW_Bld_2); try { - Assert.assertFalse(copiedArtifact.getAttributes(CoreAttributeTypes.Partition).isEmpty()); + Assert.assertFalse(copiedArtifact.getAttributeCount(CoreAttributeTypes.Partition) == 0); } finally { if (copiedArtifact != null) { copiedArtifact.deleteAndPersist(); @@ -84,7 +83,7 @@ public final class ArtifactTest { Artifact copiedArtifact = artifactWithSpecialAttr.duplicate(CoreBranches.COMMON); try { - Assert.assertTrue(copiedArtifact.getAttributes(CoreAttributeTypes.Partition).isEmpty()); + Assert.assertTrue(copiedArtifact.getAttributeCount(CoreAttributeTypes.Partition) == 0); } finally { if (copiedArtifact != null) { copiedArtifact.deleteAndPersist(); diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/AttributePurgeTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/AttributePurgeTest.java index 6585ef3be46..58681379d88 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/AttributePurgeTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/AttributePurgeTest.java @@ -47,6 +47,7 @@ public class AttributePurgeTest { private static final String[] TABLES = new String[] {"osee_attribute", "osee_txs"}; + @SuppressWarnings("deprecation") @Test public void testPurge() throws Exception { Collection<Artifact> softArts = diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ChangeDataTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ChangeDataTest.java index e7f506e2618..51dd50cbbac 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ChangeDataTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ChangeDataTest.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.client.integration.tests.integration.skynet.core; -import static junit.framework.Assert.assertEquals; import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO; +import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.Collection; import org.eclipse.osee.client.demo.DemoBranches; diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactImportWizardTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactImportWizardTest.java index d6d5cdc4ec9..a3914499623 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactImportWizardTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactImportWizardTest.java @@ -158,8 +158,8 @@ public final class ArtifactImportWizardTest { //check if artifacts have correct attributes copied over for (Artifact artifact : afterArtifacts) { - List<?> attributes = artifact.getAttributes(CoreAttributeTypes.ParagraphNumber); - for (Object attribute : attributes) { + List<String> attributes = artifact.getAttributesToStringList(CoreAttributeTypes.ParagraphNumber); + for (String attribute : attributes) { String paragraphNumberAnswer = answerParagraphNumbers.get(artifact.getName()); if (paragraphNumberAnswer != null) { Assert.assertTrue(String.format("Expected attribute: %s, on Artifact %s, was not copied. ", diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AttributeTypeEditPresenterTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AttributeTypeEditPresenterTest.java index 8c643f81042..8654832ed5c 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AttributeTypeEditPresenterTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AttributeTypeEditPresenterTest.java @@ -134,9 +134,9 @@ public class AttributeTypeEditPresenterTest { display.setSelected(itemToSelect); if (OperationType.ADD_ITEM == operationType) { - Assert.assertTrue(artifact.getAttributes(itemToSelect).isEmpty()); + Assert.assertTrue(artifact.getAttributeCount(itemToSelect) == 0); } else if (OperationType.REMOVE_ITEM == operationType) { - Assert.assertFalse(artifact.getAttributes(itemToSelect).isEmpty()); + Assert.assertFalse(artifact.getAttributeCount(itemToSelect) == 0); } Assert.assertNull(display.getAddWidgetsAttributeTypes()); @@ -149,7 +149,7 @@ public class AttributeTypeEditPresenterTest { checkDisplay(display, operationType, expectedTitle, expectedOpMessage, selectable); if (OperationType.ADD_ITEM == operationType) { - Assert.assertFalse(artifact.getAttributes(itemToSelect).isEmpty()); + Assert.assertFalse(artifact.getAttributeCount(itemToSelect) == 0); Assert.assertNull(display.getRemoveWidgetsAttributeTypes()); Collection<IAttributeType> addedTypes = display.getAddWidgetsAttributeTypes(); @@ -157,7 +157,7 @@ public class AttributeTypeEditPresenterTest { Assert.assertEquals(itemToSelect, addedTypes.iterator().next()); } else if (OperationType.REMOVE_ITEM == operationType) { - Assert.assertTrue(artifact.getAttributes(itemToSelect).isEmpty()); + Assert.assertTrue(artifact.getAttributeCount(itemToSelect) == 0); Assert.assertNull(display.getAddWidgetsAttributeTypes()); Collection<IAttributeType> removedTypes = display.getRemoveWidgetsAttributeTypes(); diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/RelationImporter.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/RelationImporter.java index 6e4b3f4271f..6f0fb441ef0 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/RelationImporter.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/RelationImporter.java @@ -122,10 +122,12 @@ public class RelationImporter implements RowProcessor { @Override public void processEmptyRow() { + // do nothing } @Override public void processCommentRow(String[] row) { + // do nothing } @Override @@ -141,5 +143,6 @@ public class RelationImporter implements RowProcessor { @Override public void foundStartOfWorksheet(String sheetName) { + // do nothing } } diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/TreeViewerTest.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/TreeViewerTest.java index 4996e471efb..ff0ca2eb598 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/TreeViewerTest.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/TreeViewerTest.java @@ -89,10 +89,12 @@ public class TreeViewerTest { @Override public void addListener(ILabelProviderListener listener) { + // do nothing } @Override public void removeListener(ILabelProviderListener listener) { + // do nothing } @Override @@ -172,16 +174,19 @@ public class TreeViewerTest { @Override public void dispose() { + // do nothing } @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + // do nothing } }; ILabelProvider labelProvider2 = new ILabelProvider() { @Override public void dispose() { + // do nothing } @Override @@ -191,10 +196,12 @@ public class TreeViewerTest { @Override public void addListener(ILabelProviderListener listener) { + // do nothing } @Override public void removeListener(ILabelProviderListener listener) { + // do nothing } @Override diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitActionDelegate.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitActionDelegate.java index a342551ddb9..59a39ba1005 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitActionDelegate.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitActionDelegate.java @@ -34,11 +34,12 @@ public class FindTraceUnitActionDelegate implements IWorkbenchWindowActionDelega @Override public void dispose() { + // do nothing } @Override public void init(IWorkbenchWindow window) { - int i = 0; + // do nothing } @Override diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitEditorAction.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitEditorAction.java index ac3dca4caad..6a27205ac9d 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitEditorAction.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitEditorAction.java @@ -47,9 +47,11 @@ public class FindTraceUnitEditorAction implements IEditorActionDelegate { @Override public void selectionChanged(IAction action, ISelection selection) { + // do nothing } @Override public void setActiveEditor(IAction action, IEditorPart targetEditor) { + // do nothing } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java index 0ba56b5da5e..925ab5bdc85 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java @@ -113,7 +113,7 @@ public class RemoveTraceMarksFromTraceUnits extends AbstractBlam { throw new OseeArgumentException("Please enter a valid %s path", type); } File file = new File(filePath); - if (file == null || !file.exists()) { + if (!file.exists()) { throw new OseeArgumentException("%s path [%s] is not accessible", type, filePath); } } diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/AbstractReport.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/AbstractReport.java index 9b5f25b44b8..49ac6b2d7df 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/AbstractReport.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/AbstractReport.java @@ -64,5 +64,6 @@ public abstract class AbstractReport { public abstract void process(IProgressMonitor monitor) throws OseeCoreException; public void clear() { + // do nothing } } diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifact.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifact.java index e5afd47b91c..b22a14bcdaf 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifact.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifact.java @@ -256,7 +256,7 @@ public class MockArtifact implements ArtifactReadable { @Override public ArtifactReadable getParent() throws OseeCoreException { - return null; + return parent; } @Override diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactHeaderComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactHeaderComponent.java index 89335ed0e7d..5f15e9c05f1 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactHeaderComponent.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactHeaderComponent.java @@ -36,6 +36,7 @@ public class MockArtifactHeaderComponent implements ArtifactHeaderComponent { @Override public void clearAll() { + // do nothing } @Override diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java index 1bb8be18c95..dc71c2242d9 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java @@ -85,7 +85,7 @@ public class MockArtifactProvider implements ArtifactProvider { public ArtifactReadable getParent(ArtifactReadable art) { if (art instanceof MockArtifact) { MockArtifact mArt = (MockArtifact) art; - return null; + return mArt.getParent(); } else { return null; } diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockDisplayOptionsComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockDisplayOptionsComponent.java index d6d5ab19dd4..245a370c7a3 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockDisplayOptionsComponent.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockDisplayOptionsComponent.java @@ -20,10 +20,12 @@ public class MockDisplayOptionsComponent implements DisplayOptionsComponent { @Override public void clearAll() { + // do nothing } @Override public void setDisplayOptions(DisplayOptions options) { + // do nothing } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockLogger.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockLogger.java index 932bc4061db..2e47f694392 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockLogger.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockLogger.java @@ -24,10 +24,12 @@ public class MockLogger implements Log { @Override public void trace(String format, Object... args) { + // do nothing } @Override public void trace(Throwable th, String format, Object... args) { + // do nothing } @Override @@ -37,10 +39,12 @@ public class MockLogger implements Log { @Override public void debug(String format, Object... args) { + // do nothing } @Override public void debug(Throwable th, String format, Object... args) { + // do nothing } @Override @@ -50,10 +54,12 @@ public class MockLogger implements Log { @Override public void info(String format, Object... args) { + // do nothing } @Override public void info(Throwable th, String format, Object... args) { + // do nothing } @Override @@ -63,10 +69,12 @@ public class MockLogger implements Log { @Override public void warn(String format, Object... args) { + // do nothing } @Override public void warn(Throwable th, String format, Object... args) { + // do nothing } @Override @@ -76,10 +84,12 @@ public class MockLogger implements Log { @Override public void error(String format, Object... args) { + // do nothing } @Override public void error(Throwable th, String format, Object... args) { + // do nothing } } diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java index ef1456c369d..c7aa7978394 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java @@ -45,9 +45,11 @@ public class MockSearchResultComponent implements SearchResultComponent { @Override public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { + // do nothing } @Override public void setDisplayOptions(DisplayOptions options) { + // do nothing } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultsListComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultsListComponent.java index 853d4385025..246fbe68b8e 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultsListComponent.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultsListComponent.java @@ -55,6 +55,7 @@ public class MockSearchResultsListComponent implements SearchResultsListComponen @Override public void noSearchResultsFound() { + // do nothing } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java b/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java index 6b27302d283..951c7e3d05b 100644 --- a/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java +++ b/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java @@ -132,10 +132,6 @@ public class SearchPresenterTest { new SearchPresenterImpl<SearchHeaderComponent, ViewSearchParameters>(provider, new MockLogger()); String artGuid = GUID.create(); MockArtifact testArt = new MockArtifact(artGuid, "name"); - MockArtifact parentArt = new MockArtifact(GUID.create(), "parent"); - MockArtifact grandParentArt = new MockArtifact(GUID.create(), "grandParent"); - parentArt.setParent(grandParentArt); - testArt.setParent(parentArt); RelationType relType = new RelationType(0L, "typeName", "sideA", "sideB", CoreArtifactTypes.AbstractSoftwareRequirement, CoreArtifactTypes.AbstractTestResult, RelationTypeMultiplicity.ONE_TO_ONE, ""); diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/AbstractCommonView.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/AbstractCommonView.java index 101384d6e94..f4bbc40c352 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/AbstractCommonView.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/AbstractCommonView.java @@ -26,7 +26,7 @@ import com.vaadin.ui.VerticalLayout; public abstract class AbstractCommonView extends VerticalLayout implements Navigator.View, HasViewTitle { protected OseeSearchHeaderComponent searchHeader; - private SearchPresenter searchPresenter; + private SearchPresenter<?, ?> searchPresenter; private boolean isLayoutComplete = false; private String initialUrl; diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeFooter.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeFooter.java index 8899dee8bd6..b1727301d7d 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeFooter.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/OseeFooter.java @@ -39,17 +39,9 @@ public class OseeFooter extends HorizontalLayout { public String getApplicationInfo() { StringBuilder builder = new StringBuilder(); - // String productName = getProductName(); - // if (productName != null) { - // builder.append(productName); - // builder.append(", "); - // } builder.append("Version: "); builder.append(getApplication().getVersion()); return builder.toString(); } - private String getProductName() { - return "Open System Engineering Environment Open Source Edition"; - } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/ComponentUtility.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/ComponentUtility.java index ba921315c0e..f569608bae5 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/ComponentUtility.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/ComponentUtility.java @@ -72,7 +72,7 @@ public final class ComponentUtility { } public static SearchPresenter<?, ?> getPresenter(Component component) { - SearchPresenter presenter = null; + SearchPresenter<?, ?> presenter = null; if (isAccessible(component)) { Application app = component.getApplication(); if (app instanceof HasPresenter) { diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java index a1fe1b52b46..7843107e6a3 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeArtifactNameLinkComponent.java @@ -48,7 +48,7 @@ public class OseeArtifactNameLinkComponent extends HorizontalLayout { public void layoutClick(LayoutClickEvent event) { String url = ComponentUtility.getUrl(OseeArtifactNameLinkComponent.this); SearchNavigator navigator = ComponentUtility.getNavigator(OseeArtifactNameLinkComponent.this); - SearchPresenter presenter = ComponentUtility.getPresenter(OseeArtifactNameLinkComponent.this); + SearchPresenter<?, ?> presenter = ComponentUtility.getPresenter(OseeArtifactNameLinkComponent.this); presenter.selectArtifact(url, OseeArtifactNameLinkComponent.this.artifact, navigator); } }); @@ -95,8 +95,6 @@ public class OseeArtifactNameLinkComponent extends HorizontalLayout { return artifact; } - private int debugindex = 0; - public void setArtifact(ViewArtifact artifact) { this.artifact = artifact; updateLayout(); diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java index 267393b2b16..fe1cfeb313f 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java @@ -53,8 +53,7 @@ public class OseeAttributeComponent extends VerticalLayout implements AttributeC @Override public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { - OseeExceptionDialogComponent dlg = - new OseeExceptionDialogComponent(msgType, shortMsg, longMsg, getApplication().getMainWindow()); + // do nothing } @Override diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java index 9bbbc8f04a7..8ecd59b1cd4 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java @@ -217,8 +217,7 @@ public class OseeRelationsComponent extends VerticalLayout implements RelationCo @Override public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { - OseeExceptionDialogComponent dlg = - new OseeExceptionDialogComponent(msgType, shortMsg, longMsg, getApplication().getMainWindow()); + // do nothing } @Override diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchHeaderComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchHeaderComponent.java index c4cc6696e40..174e40b8d53 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchHeaderComponent.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchHeaderComponent.java @@ -18,5 +18,5 @@ import com.vaadin.ui.CustomComponent; */ @SuppressWarnings("serial") public abstract class OseeSearchHeaderComponent extends CustomComponent implements SearchHeaderComponent { - + // do nothing } diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java index d19bd513221..74cfeed22a5 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java @@ -10,15 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.display.view.web.components; -import org.eclipse.osee.display.api.components.SearchHeaderComponent; import org.eclipse.osee.display.api.components.SearchResultComponent; import org.eclipse.osee.display.api.data.DisplayOptions; import org.eclipse.osee.display.api.data.SearchResultMatch; import org.eclipse.osee.display.api.data.StyledText; import org.eclipse.osee.display.api.data.ViewArtifact; -import org.eclipse.osee.display.api.data.ViewSearchParameters; -import org.eclipse.osee.display.api.search.SearchNavigator; -import org.eclipse.osee.display.api.search.SearchPresenter; import org.eclipse.osee.display.view.web.CssConstants; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; @@ -38,8 +34,6 @@ public class OseeSearchResultComponent extends VerticalLayout implements SearchR private final Label artifactType = new Label("", Label.CONTENT_XHTML); private final int TOPBOTTOM_VERT_SPACE = 8; private boolean isLayoutComplete = false; - private SearchPresenter<SearchHeaderComponent, ViewSearchParameters> searchPresenter; - private SearchNavigator navigator; @Override public void attach() { @@ -83,8 +77,6 @@ public class OseeSearchResultComponent extends VerticalLayout implements SearchR row0.setComponentAlignment(artifactType, Alignment.MIDDLE_LEFT); } - private static int i = 0; - @Override public void setArtifact(ViewArtifact artifact) { this.artifact = artifact; @@ -102,8 +94,7 @@ public class OseeSearchResultComponent extends VerticalLayout implements SearchR @Override public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { - OseeExceptionDialogComponent dlg = - new OseeExceptionDialogComponent(msgType, shortMsg, longMsg, getApplication().getMainWindow()); + // do nothing } @Override diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java index 0cc4652023c..4ee20dd916a 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java @@ -217,8 +217,7 @@ public class OseeSearchResultsListComponent extends VerticalLayout implements Se @Override public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { - OseeExceptionDialogComponent dlg = - new OseeExceptionDialogComponent(msgType, shortMsg, longMsg, getApplication().getMainWindow()); + // do nothing } @Override @@ -268,5 +267,6 @@ public class OseeSearchResultsListComponent extends VerticalLayout implements Se @Override public void noSearchResultsFound() { + // do nothing } } diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java index 7a4cb2e0901..347c06ee088 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java @@ -16,7 +16,6 @@ import org.eclipse.osee.display.view.web.AbstractCommonView; import org.eclipse.osee.display.view.web.components.OseeArtifactNameLinkComponent; import org.eclipse.osee.display.view.web.components.OseeAttributeComponent; import org.eclipse.osee.display.view.web.components.OseeBreadcrumbComponent; -import org.eclipse.osee.display.view.web.components.OseeExceptionDialogComponent; import org.eclipse.osee.display.view.web.components.OseeLeftMarginContainer; import org.eclipse.osee.display.view.web.components.OseeRelationsComponent; import com.vaadin.ui.Alignment; @@ -146,8 +145,7 @@ public abstract class OseeArtifactView extends AbstractCommonView implements Art @Override public void setErrorMessage(String shortMsg, String longMsg, MsgType msgType) { - OseeExceptionDialogComponent dlg = - new OseeExceptionDialogComponent(msgType, shortMsg, longMsg, getApplication().getMainWindow()); + // do nothing } @Override diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java index db3a8de7d9b..c52fa2208d1 100644 --- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java +++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java @@ -136,6 +136,7 @@ public class AccessControlService implements IAccessControlService { private IArtifactEventListener listener2; private final AtomicBoolean ensurePopulated = new AtomicBoolean(false); + public AccessControlService(IOseeDatabaseService databaseService, IOseeCachingService cachingService, OseeEventService eventService) { super(); @@ -480,6 +481,7 @@ public class AccessControlService implements IAccessControlService { } } + @SuppressWarnings("unchecked") public void persistPermission(AccessControlData data, boolean recurse) { ensurePopulated(); Artifact subject = data.getSubject(); diff --git a/plugins/org.eclipse.osee.framework.branch.gantt/src/org/eclipse/osee/branch/gantt/Activator.java b/plugins/org.eclipse.osee.framework.branch.gantt/src/org/eclipse/osee/branch/gantt/Activator.java index 9715d2a760b..a93ba2c781b 100644 --- a/plugins/org.eclipse.osee.framework.branch.gantt/src/org/eclipse/osee/branch/gantt/Activator.java +++ b/plugins/org.eclipse.osee.framework.branch.gantt/src/org/eclipse/osee/branch/gantt/Activator.java @@ -19,53 +19,54 @@ import org.osgi.framework.BundleContext; */ public class Activator extends AbstractUIPlugin { - // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.osee.branch.gantt"; //$NON-NLS-1$ + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.osee.branch.gantt"; //$NON-NLS-1$ - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } + // The shared instance + private static Activator plugin; - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } + /** + * The constructor + */ + public Activator() { + } - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @Override + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } - /** - * Returns an image descriptor for the image file at the given - * plug-in relative path - * - * @param path the path - * @return the image descriptor - */ - public static ImageDescriptor getImageDescriptor(String path) { - return imageDescriptorFromPlugin(PLUGIN_ID, path); - } + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + + /** + * Returns an image descriptor for the image file at the given plug-in relative path + * + * @param path the path + * @return the image descriptor + */ + public static ImageDescriptor getImageDescriptor(String path) { + return imageDescriptorFromPlugin(PLUGIN_ID, path); + } } diff --git a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpResourceRequest.java b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpResourceRequest.java index bf1f1ff60b1..6d6e16c3394 100644 --- a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpResourceRequest.java +++ b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpResourceRequest.java @@ -75,25 +75,22 @@ public class HttpResourceRequest implements IHttpMethod { private URL findResource(String urlRequested) { URL resource = null; if (Strings.isValid(urlRequested) && urlRequested.endsWith("/") != true) { - if (resource == null) { - List<IConfigurationElement> elements = - ExtensionPoints.getExtensionElements("org.eclipse.osee.framework.skynet.core.WebPage", "WebPageFolder"); - for (IConfigurationElement element : elements) { - String resourceName = element.getAttribute("Path"); - String bundleName = element.getContributor().getName(); + List<IConfigurationElement> elements = + ExtensionPoints.getExtensionElements("org.eclipse.osee.framework.skynet.core.WebPage", "WebPageFolder"); + for (IConfigurationElement element : elements) { + String resourceName = element.getAttribute("Path"); + String bundleName = element.getContributor().getName(); - if (Strings.isValid(bundleName) && Strings.isValid(resourceName)) { - try { - Bundle bundle = Platform.getBundle(bundleName); - URL url = bundle.getEntry(resourceName + urlRequested); - if (url != null) { - resource = FileLocator.resolve(url); - break; - } - } catch (Exception ex) { - throw new IllegalArgumentException(String.format("Unable to Load: [%s.%s]", bundleName, - resourceName)); + if (Strings.isValid(bundleName) && Strings.isValid(resourceName)) { + try { + Bundle bundle = Platform.getBundle(bundleName); + URL url = bundle.getEntry(resourceName + urlRequested); + if (url != null) { + resource = FileLocator.resolve(url); + break; } + } catch (Exception ex) { + throw new IllegalArgumentException(String.format("Unable to Load: [%s.%s]", bundleName, resourceName)); } } } diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCacheTest.java index 457769d011a..39664b19f21 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCacheTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCacheTest.java @@ -157,38 +157,36 @@ public abstract class AbstractOseeCacheTest<K, T extends AbstractOseeType<K>> { checkEquals(item2, actual.iterator().next()); String originalName = item1.getName(); - if (item1 instanceof AbstractOseeType) { - cache.decache(item1); + cache.decache(item1); - ((AbstractOseeType) item1).setName(item2.getName()); + ((AbstractOseeType<?>) item1).setName(item2.getName()); - if (cache.isNameUniquenessEnforced()) { - try { - cache.cache(item1); - Assert.fail("This line should not be executed"); - } catch (OseeCoreException ex) { - Assert.assertTrue(ex instanceof OseeStateException); - } + if (cache.isNameUniquenessEnforced()) { + try { + cache.cache(item1); + Assert.fail("This line should not be executed"); + } catch (OseeCoreException ex) { + Assert.assertTrue(ex instanceof OseeStateException); + } - actual = cache.getByName(originalName); - Assert.assertNotNull(actual); - Assert.assertEquals(0, actual.size()); + actual = cache.getByName(originalName); + Assert.assertNotNull(actual); + Assert.assertEquals(0, actual.size()); - } else { - cache.cache(item1); + } else { + cache.cache(item1); - actual = cache.getByName(originalName); - Assert.assertNotNull(actual); - Assert.assertEquals(0, actual.size()); + actual = cache.getByName(originalName); + Assert.assertNotNull(actual); + Assert.assertEquals(0, actual.size()); - actual = cache.getByName(item2.getName()); - Assert.assertNotNull(actual); - Assert.assertEquals(2, actual.size()); + actual = cache.getByName(item2.getName()); + Assert.assertNotNull(actual); + Assert.assertEquals(2, actual.size()); - checkEquals(item2, actual.iterator().next()); - } - ((AbstractOseeType) item1).setName(originalName); + checkEquals(item2, actual.iterator().next()); } + ((AbstractOseeType<?>) item1).setName(originalName); } @Test @@ -272,4 +270,4 @@ public abstract class AbstractOseeCacheTest<K, T extends AbstractOseeType<K>> { return result; } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BaseOseeFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BaseOseeFieldTest.java index 8ba097240b2..89b6687c688 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BaseOseeFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BaseOseeFieldTest.java @@ -39,7 +39,7 @@ public abstract class BaseOseeFieldTest { Assert.assertEquals(message, test.isInitExpectedDirty(), test.getField().isDirty()); } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Test public void testSettterGetter() throws OseeCoreException { int index = 0; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldMainTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldMainTest.java index bb9c5e05404..673f0fe5e5f 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldMainTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldMainTest.java @@ -42,7 +42,7 @@ public class OseeFieldMainTest { Assert.assertEquals(message, test.isInitExpectedDirty(), test.getField().isDirty()); } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) @Test public void testSettterGetter() throws OseeCoreException { int index = 0; diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/DefaultBasicArtifact.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/DefaultBasicArtifact.java index bf5c79d57c3..1168136833e 100644 --- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/DefaultBasicArtifact.java +++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/DefaultBasicArtifact.java @@ -18,7 +18,6 @@ import org.eclipse.osee.framework.jdk.core.type.NamedIdentity; */ public final class DefaultBasicArtifact extends NamedIdentity<String> implements IBasicArtifact<Object> { - private static final long serialVersionUID = -4997763989583925345L; private final int artId; public DefaultBasicArtifact(int artId, String guid, String name) { diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/IOseeTypeFactory.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/IOseeTypeFactory.java index 2276859fbbb..a1c789d9afb 100644 --- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/IOseeTypeFactory.java +++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/IOseeTypeFactory.java @@ -14,5 +14,5 @@ package org.eclipse.osee.framework.core.model.cache; * @author Roberto E. Escobar */ public interface IOseeTypeFactory { - + // do nothing } diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/TransactionCache.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/TransactionCache.java index 860a118a950..6e4cb3a6a30 100644 --- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/TransactionCache.java +++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/TransactionCache.java @@ -138,14 +138,17 @@ public class TransactionCache implements IOseeCache<String, TransactionRecord> { @Override public void storeAllModified() { + // do nothing } @Override public void storeItems(TransactionRecord... items) { + // do nothing } @Override public void storeItems(Collection<TransactionRecord> toStore) { + // do nothing } public TransactionRecord getPriorTransaction(TransactionRecord transactionId) throws OseeCoreException { diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java index ac1665ba6ee..38ab9852624 100644 --- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java +++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java @@ -17,7 +17,6 @@ import org.eclipse.osee.framework.jdk.core.type.BaseIdentity; * @author Donald G. Dunne */ public class DefaultBasicGuidArtifact extends BaseIdentity<String> implements IBasicGuidArtifact { - private static final long serialVersionUID = -4997763989583925345L; private final String branchGuid; private Long artTypeGuid; diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/internal/MultiServiceBinderTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/internal/MultiServiceBinderTest.java index 5007abaf756..48bdde4ba3a 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/internal/MultiServiceBinderTest.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/internal/MultiServiceBinderTest.java @@ -14,8 +14,6 @@ import java.util.Collection; import java.util.HashSet; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.eclipse.osee.framework.core.internal.AbstractServiceBinder; -import org.eclipse.osee.framework.core.internal.MultiServiceBinder; import org.eclipse.osee.framework.core.mocks.MockBundleContext; import org.eclipse.osee.framework.core.mocks.MockServiceReference; import org.eclipse.osee.framework.core.mocks.MockTrackingHandler; diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/operation/OperationBuilderTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/operation/OperationBuilderTest.java index 126e7095d76..aa3cbb63a44 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/operation/OperationBuilderTest.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/operation/OperationBuilderTest.java @@ -10,18 +10,18 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.operation; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.junit.Assert; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.osee.framework.core.enums.OperationBehavior; +import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/ServiceDependencyTrackerTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/ServiceDependencyTrackerTest.java index 1bf9a86d84f..b68d1f329a9 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/ServiceDependencyTrackerTest.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/ServiceDependencyTrackerTest.java @@ -17,9 +17,6 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.osee.framework.core.mocks.MockBundleContext; import org.eclipse.osee.framework.core.mocks.MockTrackingHandler; -import org.eclipse.osee.framework.core.util.ServiceBindType; -import org.eclipse.osee.framework.core.util.ServiceBinderFactory; -import org.eclipse.osee.framework.core.util.ServiceDependencyTracker; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java index feb7e18aa6c..eed982e4513 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java @@ -11,11 +11,10 @@ package org.eclipse.osee.framework.core.data; import org.eclipse.osee.framework.jdk.core.type.Identifiable; -import org.eclipse.osee.framework.jdk.core.type.Named; /** * @author Ryan D. Brooks */ public interface IOseeBranch extends Identifiable<String> { - // composition interface requires no additional methods,fields + // composition interface requires no additional methods,fields } diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeExceptions.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeExceptions.java index d5867dc8288..b0d7ed8269e 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeExceptions.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeExceptions.java @@ -19,8 +19,6 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; */ public final class OseeExceptions { - private static final String MSG = "OSEE Version: [%s]\nException message: [%s]"; - private OseeExceptions() { // private empty constructor is to prevent external instantiation } diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/internal/ServiceBinderFactoryImpl.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/internal/ServiceBinderFactoryImpl.java index 4c10c658809..8bb84600d90 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/internal/ServiceBinderFactoryImpl.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/internal/ServiceBinderFactoryImpl.java @@ -35,7 +35,7 @@ public final class ServiceBinderFactoryImpl implements ServiceBinderFactory { } @Override - public ServiceTracker createTracker(ServiceBindType bindType, Class<?> clazz) throws OseeStateException { + public ServiceTracker<?, ?> createTracker(ServiceBindType bindType, Class<?> clazz) throws OseeStateException { AbstractServiceBinder binder = null; if (ServiceBindType.SINGLETON == bindType) { binder = singleBinder; diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/text/tool/Find.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/text/tool/Find.java index 11464473072..61002cad26f 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/text/tool/Find.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/text/tool/Find.java @@ -90,33 +90,36 @@ public class Find { File resultFile = new File("results.txt"); BufferedWriter out = new BufferedWriter(new FileWriter(resultFile)); - List<File> files = Lib.recursivelyListFiles(new File(args[1]), Pattern.compile(args[2])); - System.out.println("Searching " + files.size() + " files..."); - if (files.isEmpty()) { - return; - } + try { + List<File> files = Lib.recursivelyListFiles(new File(args[1]), Pattern.compile(args[2])); + System.out.println("Searching " + files.size() + " files..."); + if (files.isEmpty()) { + return; + } - FileToBufferConvert toBuffer = null; - if (Boolean.valueOf(args[6]).booleanValue()) { - toBuffer = new StripBlockComments(); - } else { - toBuffer = simpleToBuffer; - } + FileToBufferConvert toBuffer = null; + if (Boolean.valueOf(args[6]).booleanValue()) { + toBuffer = new StripBlockComments(); + } else { + toBuffer = simpleToBuffer; + } - Find app = new Find(patterns, files, toBuffer); - app.setRegionPadding(Integer.parseInt(args[3]), Integer.parseInt(args[4])); + Find app = new Find(patterns, files, toBuffer); + app.setRegionPadding(Integer.parseInt(args[3]), Integer.parseInt(args[4])); - if (Boolean.valueOf(args[5]).booleanValue()) { - app.findMeNot(); - } else { - app.find(999999, true); - } - OutputStreamWriter stdOut = new OutputStreamWriter(System.out); - stdOut.write(resultFile.getAbsolutePath()); + if (Boolean.valueOf(args[5]).booleanValue()) { + app.findMeNot(); + } else { + app.find(999999, true); + } + OutputStreamWriter stdOut = new OutputStreamWriter(System.out); + stdOut.write(resultFile.getAbsolutePath()); - app.writeUnusedPatterns(stdOut); - app.getResults().writeFindResutls(out); - out.close(); + app.writeUnusedPatterns(stdOut); + app.getResults().writeFindResutls(out); + } finally { + out.close(); + } } public void setRegionPadding(int precedingCount, int trailingCount) { diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/BaseIdentity.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/BaseIdentity.java index 638a0d459ef..9845ef16ccd 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/BaseIdentity.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/BaseIdentity.java @@ -31,6 +31,7 @@ public class BaseIdentity<T> implements Identity<T> { return getGuid().hashCode(); } + @SuppressWarnings("unchecked") @Override public boolean equals(Object obj) { boolean equal = false; diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/VariantData.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/VariantData.java index b968a6d3938..88a278ad423 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/VariantData.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/VariantData.java @@ -24,7 +24,6 @@ import org.eclipse.osee.framework.jdk.core.util.Lib; * @author Roberto E. Escobar */ public class VariantData implements IVariantData { - private static final long serialVersionUID = 9076969425223251739L; private static final String EXCEPTION_MESSAGE = "No setting found for key: [%s]"; private static final String CONVERSION_EXCEPTION_MESSAGE = "Unable to convert [%s] from [%s] to [%s]"; diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/AXml.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/AXml.java index fcad6b153ec..808c963dc9f 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/AXml.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/AXml.java @@ -40,10 +40,6 @@ public class AXml { return addTagData(elementName, data, false); } - public static String addTagData(String elementName, Integer[] data, String separator) { - return addTagData(elementName, Collections.toString(separator, data), false); - } - public static String addTagData(String elementName, Collection<Integer> data, String separator) { return addTagData(elementName, Collections.toString(separator, data), false); } diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/ByteUtil.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/ByteUtil.java index 16536c84f1e..8053a725f53 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/ByteUtil.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/ByteUtil.java @@ -48,23 +48,19 @@ public class ByteUtil { } public static void printHex(byte[] data, int bytesPerGroup, int groupPerLine, StringBuilder strBuilder) { - int groups = 0; for (int i = 0; i < data.length; i++) { strBuilder.append(ByteUtil.toHexString(data[i])); if ((i + 1) % bytesPerGroup == 0) { strBuilder.append(" "); - groups++; } } } public static void printHex(byte[] data, int bytesPerGroup, int groupPerLine, boolean isSpaced, StringBuilder strBuilder) { - int groups = 0; for (int i = 0; i < data.length; i++) { strBuilder.append(ByteUtil.toHexString(data[i])); if ((i + 1) % bytesPerGroup == 0 && isSpaced) { strBuilder.append(" "); - groups++; } } } diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Lib.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Lib.java index 48179d1fbe2..eb13c4034a5 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Lib.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Lib.java @@ -213,6 +213,7 @@ public final class Lib { return stringWriter.toString(); } + @SuppressWarnings("resource") public static void copyFile(File source, File destination) throws IOException { final FileChannel in = new FileInputStream(source).getChannel(); try { diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/SingletonApplicationInstance.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/SingletonApplicationInstance.java index d41b7d4617f..096d82800bf 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/SingletonApplicationInstance.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/SingletonApplicationInstance.java @@ -17,8 +17,6 @@ import java.nio.channels.DatagramChannel; public class SingletonApplicationInstance { - private static DatagramChannel lockChannel; - public static void verifySingleton(int port) throws Exception { if (findOther(port)) { System.out.println("found another instance"); @@ -34,7 +32,6 @@ public class SingletonApplicationInstance { channel.configureBlocking(true); InetSocketAddress address = new InetSocketAddress(host, port); channel.socket().bind(address); - lockChannel = channel; return false; } catch (BindException e) { return true; diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/io/Zip.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/io/Zip.java index b2155bca0e3..067defd8500 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/io/Zip.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/io/Zip.java @@ -56,6 +56,7 @@ public class Zip { // Complete the ZIP file out.close(); } catch (IOException e) { + // do nothing } } diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/io/xml/WordMlTableWriter.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/io/xml/WordMlTableWriter.java index db284176f8f..23119667fdb 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/io/xml/WordMlTableWriter.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/io/xml/WordMlTableWriter.java @@ -72,17 +72,16 @@ public class WordMlTableWriter extends AbstractSheetWriter { @Override public void writeCellText(Object cellData, int cellIndex) throws IOException { - if(cellData instanceof String){ - String cellDataStr = (String)cellData; - str.append(CELL_STRART); - if (cellDataStr != null) { - str.append(cellDataStr); - } - str.append(CELL_END); - } + if (cellData instanceof String) { + String cellDataStr = (String) cellData; + str.append(CELL_STRART); + str.append(cellDataStr); + str.append(CELL_END); + } } @Override public void endWorkbook() { + // do nothing } } diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/io/xml/WordSaxHandler.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/io/xml/WordSaxHandler.java index 039521360fd..48b28865c88 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/io/xml/WordSaxHandler.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/io/xml/WordSaxHandler.java @@ -40,10 +40,6 @@ public class WordSaxHandler extends AbstractSaxHandler { inHeader = true; } else if (localName.equalsIgnoreCase("ftr")) { inFooter = true; - } else if (localName.equalsIgnoreCase("Table")) { - - } else if (localName.equalsIgnoreCase("Worksheet")) { - } } diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/network/PortUtil.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/network/PortUtil.java index a5b6c327cef..cd83ac7b3a0 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/network/PortUtil.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/network/PortUtil.java @@ -92,7 +92,7 @@ public class PortUtil { if (nextPort >= basePort + 250 - numberOfPorts) { nextPort = basePort; } - for (int i = nextPort, count = 1; i < basePort + 250; i++, count++) { + for (int i = nextPort; i < basePort + 250; i++) { boolean passed = true; for (int j = i; j < numberOfPorts + i; j++) { if (!checkIfPortIsTaken(j)) { diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/Xml.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/Xml.java index 307a847757f..17b98506cbb 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/Xml.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/Xml.java @@ -37,7 +37,6 @@ public class Xml { private static final String[] XML_ESCAPES = new String[] {"&", "<", ">", """}; private static final String LINEFEED = " "; private static final String CARRIAGE_RETURN = " "; - private static final Pattern squareBracket = Pattern.compile("\\]"); public final static XPathFactory myXPathFactory = XPathFactory.newInstance(); public final static XPath myXPath = myXPathFactory.newXPath(); public final static String wordLeader1 = diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/XmlTransformAsProcess.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/XmlTransformAsProcess.java index 6feb54a4bb6..89a96fde846 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/XmlTransformAsProcess.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/XmlTransformAsProcess.java @@ -46,7 +46,7 @@ public class XmlTransformAsProcess { outputFromNetwork = null; } - private URL getClassLocation(final Class classToFind) { + private URL getClassLocation(final Class<XmlTransformServer> classToFind) { URL result = null; if (classToFind == null) { throw new IllegalArgumentException("Class is null"); @@ -68,6 +68,7 @@ public class XmlTransformAsProcess { result = new URL(result, classAsResource); } } catch (MalformedURLException ignore) { + // do nothing } } } diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Cell.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Cell.java index d2f372e0994..85f5c88da72 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Cell.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Cell.java @@ -25,5 +25,6 @@ public class Cell implements Xmlizable { } public void initializeFromXml(Document doc) { + // do nothing } } diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Row.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Row.java index 00e1b2e37c4..79ed6b22042 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Row.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Row.java @@ -25,5 +25,6 @@ public class Row implements Xmlizable { } public void initializeFromXml(Document doc) { + // do nothing } } diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Style.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Style.java index e158a78d3b0..c729b75f8a3 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Style.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Style.java @@ -25,5 +25,6 @@ public class Style implements Xmlizable { } public void initializeFromXml(Document doc) { + // do nothing } } diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Table.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Table.java index 1a731668de3..05ffbb7915d 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Table.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/Table.java @@ -25,5 +25,6 @@ public class Table implements Xmlizable { } public void initializeFromXml(Document doc) { + // do nothing } } diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/WorkBook.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/WorkBook.java index 61b37765624..db6204d7b28 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/WorkBook.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/WorkBook.java @@ -25,5 +25,6 @@ public class WorkBook implements Xmlizable { } public void initializeFromXml(Document doc) { + // do nothing } } diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/WorkSheet.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/WorkSheet.java index 025f573857d..5f497dc5763 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/WorkSheet.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/xml/excel/WorkSheet.java @@ -25,5 +25,6 @@ public class WorkSheet implements Xmlizable { } public void initializeFromXml(Document doc) { + // do nothing } } diff --git a/plugins/org.eclipse.osee.framework.logging/src/org/eclipse/osee/framework/logging/SimpleOseeHandler.java b/plugins/org.eclipse.osee.framework.logging/src/org/eclipse/osee/framework/logging/SimpleOseeHandler.java index c276309608e..317b9469237 100644 --- a/plugins/org.eclipse.osee.framework.logging/src/org/eclipse/osee/framework/logging/SimpleOseeHandler.java +++ b/plugins/org.eclipse.osee.framework.logging/src/org/eclipse/osee/framework/logging/SimpleOseeHandler.java @@ -25,10 +25,12 @@ public class SimpleOseeHandler extends Handler { @Override public void close() throws SecurityException { + // do nothing } @Override public void flush() { + // do nothing } @Override diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/ArtifactUtil.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/ArtifactUtil.java index d8482f9d58c..5b99ffe9b7f 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/ArtifactUtil.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/ArtifactUtil.java @@ -22,7 +22,6 @@ public class ArtifactUtil { private static final String URI_BY_GUID = "SELECT att.uri FROM osee_artifact art, osee_attribute att, %s txs where art.guid = ? and art.art_id = att.art_id and att.uri is not null and att.gamma_id = txs.gamma_id and txs.branch_id = ? and txs.tx_current = ?"; - @SuppressWarnings("unchecked") public static String getUri(String artifactGuid, Branch branch) throws OseeCoreException { String sql = String.format(URI_BY_GUID, getTransactionTable(branch)); return ConnectionHandler.runPreparedQueryFetchString("", sql, artifactGuid, branch.getId(), diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpBranchExchangeInfo.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpBranchExchangeInfo.java index ddec7e8613f..8d8902476c3 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpBranchExchangeInfo.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpBranchExchangeInfo.java @@ -35,7 +35,6 @@ public class HttpBranchExchangeInfo { private boolean deleteExportFile; private final PropertyStore options; - @SuppressWarnings("unchecked") public HttpBranchExchangeInfo(HttpServletRequest request) throws Exception { this.options = new PropertyStore(); this.function = null; diff --git a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/DynamicWizard.java b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/DynamicWizard.java index b9b75fb7505..6e650468fe5 100644 --- a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/DynamicWizard.java +++ b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/DynamicWizard.java @@ -119,6 +119,7 @@ public abstract class DynamicWizard implements IWizard { */ @Override public void addPages() { + // do nothing } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/EnhancedTabFolder.java b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/EnhancedTabFolder.java index fd40c112e5e..8bc574a06bc 100644 --- a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/EnhancedTabFolder.java +++ b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/EnhancedTabFolder.java @@ -11,8 +11,8 @@ package org.eclipse.osee.framework.ui.swt; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.events.TraverseEvent; import org.eclipse.swt.events.TraverseListener; import org.eclipse.swt.widgets.Composite; @@ -26,11 +26,7 @@ public class EnhancedTabFolder implements ITabFolderItem { public EnhancedTabFolder(Composite parent, int style) { folder = new TabFolder(parent, style); - folder.addSelectionListener(new SelectionListener() { - - @Override - public void widgetDefaultSelected(SelectionEvent e) { - } + folder.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent event) { diff --git a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/HyperLinkLabel.java b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/HyperLinkLabel.java index e546529a796..e5101d65525 100644 --- a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/HyperLinkLabel.java +++ b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/HyperLinkLabel.java @@ -12,6 +12,7 @@ package org.eclipse.osee.framework.ui.swt; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.events.MouseTrackAdapter; import org.eclipse.swt.events.MouseTrackListener; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; @@ -59,7 +60,7 @@ public class HyperLinkLabel extends Label { public static void adapt(final Label label) { label.setForeground(Displays.getSystemColor(SWT.COLOR_BLUE)); - label.addMouseTrackListener(new MouseTrackListener() { + label.addMouseTrackListener(new MouseTrackAdapter() { @Override public void mouseEnter(MouseEvent e) { @@ -71,13 +72,10 @@ public class HyperLinkLabel extends Label { label.setCursor(null); }; - @Override - public void mouseHover(MouseEvent e) { - } }); } - MouseTrackListener listener = new MouseTrackListener() { + MouseTrackListener listener = new MouseTrackAdapter() { @Override public void mouseEnter(MouseEvent e) { @@ -89,9 +87,6 @@ public class HyperLinkLabel extends Label { setCursor(null); }; - @Override - public void mouseHover(MouseEvent e) { - } }; public void refresh() { @@ -114,8 +109,4 @@ public class HyperLinkLabel extends Label { refresh(); } - @Override - protected void checkSubclass() { - } - } diff --git a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/TreeNode.java b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/TreeNode.java index 7d96a029ab0..f0275e38ab5 100644 --- a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/TreeNode.java +++ b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/TreeNode.java @@ -102,6 +102,7 @@ public class TreeNode implements ITreeNode, Serializable { } } + @SuppressWarnings("rawtypes") @Override public Object getAdapter(Class adapter) { if (adapter == null) { diff --git a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/TreeViewerUtility.java b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/TreeViewerUtility.java index 0ff34ea9d31..4c1b6bf7fe6 100644 --- a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/TreeViewerUtility.java +++ b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/TreeViewerUtility.java @@ -51,7 +51,7 @@ public class TreeViewerUtility { @SuppressWarnings("unchecked") private static <A extends Object> void populateSelectionHash(TreeViewer tree, Map<A, Object> selectionHash) { - Iterator iterator = ((IStructuredSelection) tree.getSelection()).iterator(); + Iterator<?> iterator = ((IStructuredSelection) tree.getSelection()).iterator(); while (iterator.hasNext()) { selectionHash.put((A) iterator.next(), dummy); diff --git a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/Widgets.java b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/Widgets.java index dd08e542357..bacb63faf82 100644 --- a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/Widgets.java +++ b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/Widgets.java @@ -582,7 +582,7 @@ public final class Widgets { rdo.setData(obj); rdo.setSelection(count == 0 ? true : false); positionGridItem(rdo, false, SWT.BEGINNING, SWT.CENTER); - rdo.addSelectionListener(new SelectionListener() { + rdo.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { if (rdo.getSelection()) { @@ -590,10 +590,6 @@ public final class Widgets { } } - @Override - public void widgetDefaultSelected(SelectionEvent e) { - - } }); count++; } @@ -613,7 +609,7 @@ public final class Widgets { rdo.setData(obj); rdo.setSelection(count == 0 ? true : false); positionGridItem(rdo, false, SWT.BEGINNING, SWT.CENTER); - rdo.addSelectionListener(new SelectionListener() { + rdo.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { if (rdo.getSelection()) { @@ -622,10 +618,6 @@ public final class Widgets { } } - @Override - public void widgetDefaultSelected(SelectionEvent e) { - - } }); count++; } diff --git a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/hex/HexTableContentProvider.java b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/hex/HexTableContentProvider.java index e1ae3641cc7..60bd8b07a2f 100644 --- a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/hex/HexTableContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/hex/HexTableContentProvider.java @@ -35,7 +35,7 @@ class HexTableContentProvider implements ILazyContentProvider { @Override public void dispose() { - + // do nothing } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.ws/src/org/eclipse/osee/framework/ui/ws/AJavaProject.java b/plugins/org.eclipse.osee.framework.ui.ws/src/org/eclipse/osee/framework/ui/ws/AJavaProject.java index 474bad23160..26b2eb9e4a0 100644 --- a/plugins/org.eclipse.osee.framework.ui.ws/src/org/eclipse/osee/framework/ui/ws/AJavaProject.java +++ b/plugins/org.eclipse.osee.framework.ui.ws/src/org/eclipse/osee/framework/ui/ws/AJavaProject.java @@ -80,10 +80,10 @@ public final class AJavaProject { if (paths[i].getPath().toFile().exists()) { // urls.add(paths[i].getPath().toFile()); } else { - File f = null; - f = new File(AWorkspace.getWorkspacePath().concat(paths[i].getPath().toOSString())); - if (f != null && f.exists()) { - urls.add(f); + File file = null; + file = new File(AWorkspace.getWorkspacePath().concat(paths[i].getPath().toOSString())); + if (file.exists()) { + urls.add(file); } } } else if (paths[i].getEntryKind() == IClasspathEntry.CPE_PROJECT) { diff --git a/plugins/org.eclipse.osee.framework.ui.ws/src/org/eclipse/osee/framework/ui/ws/AWorkspace.java b/plugins/org.eclipse.osee.framework.ui.ws/src/org/eclipse/osee/framework/ui/ws/AWorkspace.java index ed1fda98861..b2ec30464a0 100644 --- a/plugins/org.eclipse.osee.framework.ui.ws/src/org/eclipse/osee/framework/ui/ws/AWorkspace.java +++ b/plugins/org.eclipse.osee.framework.ui.ws/src/org/eclipse/osee/framework/ui/ws/AWorkspace.java @@ -201,6 +201,7 @@ public final class AWorkspace { recursiveFileFind(fileName, res, matches); } } catch (CoreException ex) { + // do nothing } } } @@ -224,6 +225,7 @@ public final class AWorkspace { recursiveFileFindMatch(regex, res, matches); } } catch (CoreException ex) { + // do nothing } } } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/FilterableCollection.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/FilterableCollection.java index 9a1b5ce48c8..a8dfe184fd2 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/FilterableCollection.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/FilterableCollection.java @@ -89,7 +89,7 @@ public abstract class FilterableCollection<MATCH_DATA, KEY, DATA> { return createResultSet(values); } - @SuppressWarnings({"unchecked", "unused"}) + @SuppressWarnings({"unchecked"}) private <T extends DATA> List<T> getListByFilter(Collection<DATA> source, Predicate<MATCH_DATA> matcher) throws OseeCoreException { List<T> toReturn; if (source != null && !source.isEmpty()) { diff --git a/plugins/org.eclipse.osee.support.dev.java/src/org/eclipse/osee/support/dev/java/JavaJdtTipsAndTricks.java b/plugins/org.eclipse.osee.support.dev.java/src/org/eclipse/osee/support/dev/java/JavaJdtTipsAndTricks.java index efe9fdbbbcf..e215aba1e5e 100644 --- a/plugins/org.eclipse.osee.support.dev.java/src/org/eclipse/osee/support/dev/java/JavaJdtTipsAndTricks.java +++ b/plugins/org.eclipse.osee.support.dev.java/src/org/eclipse/osee/support/dev/java/JavaJdtTipsAndTricks.java @@ -36,6 +36,7 @@ public class JavaJdtTipsAndTricks { // JavaTip 02) Content assist after insanceof condition - Cast added for you // How: type "obj." > Ctrl-Space > select getLocalizedMessage; Exception cast added automatically if (obj instanceof Exception) { + // do nothing } } @@ -81,6 +82,7 @@ public class JavaJdtTipsAndTricks { // How: Select "start" parameter above > Ctrl+1 > assign parameter to new field } + @SuppressWarnings("unused") public void quickFixField() { // JavaTip 11) Quick-Fix - convert local variable to global // How: type 'String str = "this is it";' > select "str" > Ctrl+1 > convert local to field @@ -134,6 +136,7 @@ public class JavaJdtTipsAndTricks { // JavaTip 19) Quick-Fix - cast and assign off instanceof // How: cursor on instanceof > Ctrl+1 > Introduce new local with cast type if (obj instanceof String) { + // do nothing } // JavaTip 20) Quick-Fix - Inverse boolean expression @@ -144,13 +147,14 @@ public class JavaJdtTipsAndTricks { // How: perform previous java tip > select outer if statements > Ctrl+1 > Join if statements boolean thisVar = false, thatVar = true; if (thisVar && !thatVar) { - + // do nothing } // JavaTip 23) Quick-Fix - Add parentheses // How: select line below > Ctrl+1 > Add paranoidal parentheses boolean a = false, b = true, c = true, d = false; if (a == b && c != d) { + // do nothing } // JavaTip 24) Quick-Fix - Conditional expresion to if/else and back diff --git a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/SourceCounter.java b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/SourceCounter.java index 5d95088dddf..297f969b745 100644 --- a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/SourceCounter.java +++ b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/SourceCounter.java @@ -241,9 +241,7 @@ public class SourceCounter { } slocCounter += slocCount; - String authorsStr = ""; for (String author : authors) { - authorsStr += author + "; "; authorToFileCount.put(author); authorToSlocCount.put(author, slocCount); } |