From 4f42453c77772c62bc34c5efc4a410eb125cba77 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Thu, 31 Mar 2016 18:48:20 +0100
Subject: Switch method naming to use simple name of args/return type

---
 src/main/java/org/zwobble/couscous/backends/Names.java         |  2 +-
 src/main/java/org/zwobble/couscous/backends/Naming.java        |  4 ++--
 .../backends/SignaturesContainFullyQualifiedNames.java         | 10 ----------
 .../couscous/backends/SignaturesContainSimpleNames.java        | 10 ++++++++++
 .../zwobble/couscous/backends/csharp/CsharpCodeGenerator.java  |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 src/main/java/org/zwobble/couscous/backends/SignaturesContainFullyQualifiedNames.java
 create mode 100644 src/main/java/org/zwobble/couscous/backends/SignaturesContainSimpleNames.java

(limited to 'src/main/java/org')

diff --git a/src/main/java/org/zwobble/couscous/backends/Names.java b/src/main/java/org/zwobble/couscous/backends/Names.java
index d7b3ac2..a9024ac 100644
--- a/src/main/java/org/zwobble/couscous/backends/Names.java
+++ b/src/main/java/org/zwobble/couscous/backends/Names.java
@@ -20,7 +20,7 @@ public class Names {
         return argument.accept(new Type.Visitor<String>() {
             @Override
             public String visit(ScalarType type) {
-                return type.getQualifiedName().replace('.', '_');
+                return type.getSimpleName();
             }
 
             @Override
diff --git a/src/main/java/org/zwobble/couscous/backends/Naming.java b/src/main/java/org/zwobble/couscous/backends/Naming.java
index 1681efd..52be8b8 100644
--- a/src/main/java/org/zwobble/couscous/backends/Naming.java
+++ b/src/main/java/org/zwobble/couscous/backends/Naming.java
@@ -3,8 +3,8 @@ package org.zwobble.couscous.backends;
 import org.zwobble.couscous.ast.MethodSignature;
 
 public interface Naming {
-    static Naming signaturesContainsSimpleNames() {
-        return new SignaturesContainFullyQualifiedNames();
+    static Naming signaturesContainSimpleNames() {
+        return new SignaturesContainSimpleNames();
     }
 
     String methodName(MethodSignature signature);
diff --git a/src/main/java/org/zwobble/couscous/backends/SignaturesContainFullyQualifiedNames.java b/src/main/java/org/zwobble/couscous/backends/SignaturesContainFullyQualifiedNames.java
deleted file mode 100644
index f8b9faf..0000000
--- a/src/main/java/org/zwobble/couscous/backends/SignaturesContainFullyQualifiedNames.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.zwobble.couscous.backends;
-
-import org.zwobble.couscous.ast.MethodSignature;
-
-public class SignaturesContainFullyQualifiedNames implements Naming {
-    @Override
-    public String methodName(MethodSignature signature) {
-        return Names.toUniqueName(signature);
-    }
-}
diff --git a/src/main/java/org/zwobble/couscous/backends/SignaturesContainSimpleNames.java b/src/main/java/org/zwobble/couscous/backends/SignaturesContainSimpleNames.java
new file mode 100644
index 0000000..fec7a88
--- /dev/null
+++ b/src/main/java/org/zwobble/couscous/backends/SignaturesContainSimpleNames.java
@@ -0,0 +1,10 @@
+package org.zwobble.couscous.backends;
+
+import org.zwobble.couscous.ast.MethodSignature;
+
+public class SignaturesContainSimpleNames implements Naming {
+    @Override
+    public String methodName(MethodSignature signature) {
+        return Names.toUniqueName(signature);
+    }
+}
diff --git a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java
index 5f00f85..c3ef019 100644
--- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java
+++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java
@@ -29,7 +29,7 @@ public class CsharpCodeGenerator {
     private final NodeTransformer nodeTransformer;
 
     public static Node generateCode(Node node, String namespace) {
-        return new CsharpCodeGenerator(Naming.signaturesContainsSimpleNames(), namespace).generateCode(node);
+        return new CsharpCodeGenerator(Naming.signaturesContainSimpleNames(), namespace).generateCode(node);
     }
 
     private CsharpCodeGenerator(Naming naming, String namespace) {
-- 
cgit v1.2.3