Merge pull request #9 from hmrc/PLATUI-352

PlatUI-352 rename to prevent name clash in Twirl compilation

src/main/play-25/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcAccountMenu.scala.html

@@ -1,6 +1,18 @@
-
-
-
+@*
+ * Copyright 2020 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @(params: AccountMenu)
 @import params._

src/main/play-25/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcBanner.scala.html

@@ -1,6 +1,18 @@
-
-
-
+@*
+ * Copyright 2020 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @(params: Banner)
 @import params._

src/main/play-25/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcHeader.scala.html

@@ -1,6 +1,18 @@
-
-
-
+@*
+ * Copyright 2020 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @(params: Header)
 @import params._

src/main/play-25/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcInternalHeader.scala.html

@@ -1,6 +1,18 @@
-
-
-
+@*
+ * Copyright 2020 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @(params: InternalHeader)
 @import params._

src/main/play-25/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcLanguageSelect.scala.html

@@ -1,6 +1,18 @@
-
-
-
+@*
+ * Copyright 2020 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @(params: LanguageSelect)
 @import params._

src/main/play-25/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcNewTabLink.scala.html

@@ -1,6 +1,18 @@
-
-
-
+@*
+ * Copyright 2020 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @(params: NewTabLink)
 @import params._

src/main/play-25/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcNotificationBadge.scala.html

@@ -1,6 +1,18 @@
-
-
-
+@*
+ * Copyright 2020 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @(params: NotificationBadge = NotificationBadge())
 @import params._

src/main/play-25/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcPageHeading.scala.html

@@ -1,6 +1,18 @@
-
-
-
+@*
+ * Copyright 2020 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @(params: PageHeading)
 @import params._

src/main/play-25/twirl/uk/gov/hmrc/hmrcfrontend/views/components/hmrcTimeoutDialog.scala.html

@@ -1,6 +1,18 @@
-
-
-
+@*
+ * Copyright 2020 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @(params: TimeoutDialog)
 @import params._

src/main/play-25/uk/gov/hmrc/hmrcfrontend/controllers/Assets.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 HM Revenue & Customs
+ * Copyright 2020 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/play-25/uk/gov/hmrc/hmrcfrontend/views/html/components/package.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 HM Revenue & Customs
+ * Copyright 2020 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/scala/uk/gov/hmrc/hmrcfrontend/views/Aliases.scala

@@ -48,8 +48,8 @@ trait Aliases {
   type LanguageToggle = viewmodels.language.LanguageToggle
   val LanguageToggle = viewmodels.language.LanguageToggle
 
-  type Messages = viewmodels.accountmenu.Messages
-  val Messages = viewmodels.accountmenu.Messages
+  type AccountMessages = viewmodels.accountmenu.AccountMessages
+  val AccountMessages = viewmodels.accountmenu.AccountMessages
 
   type NavigationItem = viewmodels.header.NavigationItem
   val NavigationItem = viewmodels.header.NavigationItem

src/main/scala/uk/gov/hmrc/hmrcfrontend/views/viewmodels/accountmenu/AccountMenu.scala

@@ -23,7 +23,7 @@ import uk.gov.hmrc.hmrcfrontend.views.viewmodels.language.Language
 
 case class AccountMenu(
                         accountHome: AccountHome = AccountHome(),
-                        messages: Messages = Messages(),
+                        messages: AccountMessages = AccountMessages(),
                         checkProgress: CheckProgress = CheckProgress(),
                         paperlessSettings: PaperlessSettings = PaperlessSettings(),
                         personalDetails: PersonalDetails = PersonalDetails(),

src/main/scala/uk/gov/hmrc/hmrcfrontend/views/viewmodels/accountmenu/Messages.scala → src/main/scala/uk/gov/hmrc/hmrcfrontend/views/viewmodels/accountmenu/AccountMessages.scala

@@ -19,17 +19,17 @@ package uk.gov.hmrc.hmrcfrontend.views.viewmodels.accountmenu
 import play.api.libs.json._
 import uk.gov.hmrc.hmrcfrontend.views.viewmodels.JsonDefaultValueFormatter
 
-case class Messages(
+case class AccountMessages(
                      href: String = "#",
                      active: Boolean = false,
                      messageCount: Option[Int] = None
                    )
 
-object Messages extends JsonDefaultValueFormatter[Messages] {
+object AccountMessages extends JsonDefaultValueFormatter[AccountMessages] {
 
-  override def defaultObject: Messages = Messages()
+  override def defaultObject: AccountMessages = AccountMessages()
 
-  override def defaultReads: Reads[Messages] = Json.reads[Messages]
+  override def defaultReads: Reads[AccountMessages] = Json.reads[AccountMessages]
 
-  override implicit def jsonWrites: OWrites[Messages] = Json.writes[Messages]
+  override implicit def jsonWrites: OWrites[AccountMessages] = Json.writes[AccountMessages]
 }

src/test/scala/uk/gov/hmrc/hmrcfrontend/views/viewmodels/accountmenu/MessagesSpec.scala → src/test/scala/uk/gov/hmrc/hmrcfrontend/views/viewmodels/accountmenu/AccountMessagesSpec.scala

@@ -19,4 +19,4 @@ package uk.gov.hmrc.hmrcfrontend.views.viewmodels.accountmenu
 import uk.gov.hmrc.hmrcfrontend.views.viewmodels.JsonRoundtripSpec
 import uk.gov.hmrc.hmrcfrontend.views.viewmodels.accountmenu.Generators._
 
-class MessagesSpec extends JsonRoundtripSpec[Messages]
+class AccountMessagesSpec extends JsonRoundtripSpec[AccountMessages]

src/test/scala/uk/gov/hmrc/hmrcfrontend/views/viewmodels/accountmenu/Generators.scala

@@ -39,13 +39,13 @@ object Generators {
       CheckProgress(href = href, active = active)
   }
 
-  implicit val arbMessages: Arbitrary[Messages] = Arbitrary {
+  implicit val arbMessages: Arbitrary[AccountMessages] = Arbitrary {
     for {
       href         <- genAlphaStr()
       active       <- arbBool.arbitrary
       messageCount <- Gen.option(Gen.chooseNum(0, 5))
     } yield
-      Messages(href = href, active = active, messageCount = messageCount)
+      AccountMessages(href = href, active = active, messageCount = messageCount)
   }
 
   implicit val arbPaperlessSettings: Arbitrary[PaperlessSettings] = Arbitrary {