From 70c36f7fef68a4408c7529ad4213df11f49766df Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 29 Mar 2018 15:39:59 +0200
Subject: [PATCH] rebase

---
 .../metadata-registry/metadata-registry.component.ts      | 6 +++---
 .../metadata-schema/metadata-schema.component.ts          | 8 ++++----
 .../registry.service.ts}                                  | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename src/app/core/{metadata/metadataregistry.service.ts => registry/registry.service.ts} (99%)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index c92aae9945..3158c4bb46 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { MetadataRegistryService } from '../../../core/metadata/metadataregistry.service';
+import { RegistryService } from '../../../core/registry/registry.service';
 import { Observable } from 'rxjs/Observable';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
@@ -13,8 +13,8 @@ export class MetadataRegistryComponent {
 
   metadataSchemas: Observable<RemoteData<PaginatedList<MetadataSchema>>>;
 
-  constructor(private metadataRegistryService: MetadataRegistryService) {
-    this.metadataSchemas = this.metadataRegistryService.getMetadataSchemas();
+  constructor(private registryService: RegistryService) {
+    this.metadataSchemas = this.registryService.getMetadataSchemas();
   }
 
 }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index bcb725d4ac..15d0ee18a2 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { MetadataRegistryService } from '../../../core/metadata/metadataregistry.service';
+import { RegistryService } from '../../../core/registry/registry.service';
 import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs/Observable';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -18,7 +18,7 @@ export class MetadataSchemaComponent implements OnInit {
   metadataSchema: Observable<RemoteData<MetadataSchema>>;
   metadataFields: Observable<RemoteData<PaginatedList<MetadataField>>>;
 
-  constructor(private metadataRegistryService: MetadataRegistryService, private route: ActivatedRoute) {
+  constructor(private registryService: RegistryService, private route: ActivatedRoute) {
 
   }
 
@@ -29,10 +29,10 @@ export class MetadataSchemaComponent implements OnInit {
   }
 
   initialize(params) {
-    this.metadataSchema = this.metadataRegistryService.getMetadataSchemaByName(params.schemaName);
+    this.metadataSchema = this.registryService.getMetadataSchemaByName(params.schemaName);
     this.metadataSchema.subscribe((value) => {
       const schema = value.payload;
-      this.metadataFields = this.metadataRegistryService.getMetadataFieldsBySchema(schema);
+      this.metadataFields = this.registryService.getMetadataFieldsBySchema(schema);
       this.namespace = { namespace: value.payload.namespace };
     });
   }
diff --git a/src/app/core/metadata/metadataregistry.service.ts b/src/app/core/registry/registry.service.ts
similarity index 99%
rename from src/app/core/metadata/metadataregistry.service.ts
rename to src/app/core/registry/registry.service.ts
index bb3e4154bc..362478a054 100644
--- a/src/app/core/metadata/metadataregistry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -2,12 +2,12 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 import { RemoteData } from '../data/remote-data';
 import { PaginatedList } from '../data/paginated-list';
-import { MetadataSchema } from './metadataschema.model';
-import { MetadataField } from './metadatafield.model';
 import { PageInfo } from '../shared/page-info.model';
+import { MetadataSchema } from '../metadata/metadataschema.model';
+import { MetadataField } from '../metadata/metadatafield.model';
 
 Injectable()
-export class MetadataRegistryService {
+export class RegistryService {
 
   metadataSchemas: MetadataSchema[];
   metadataFields: MetadataField[];